From patchwork Tue Feb 6 12:13:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 197445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1533968dyb; Tue, 6 Feb 2024 05:24:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtmkKKMdryJq3t8fDOoT9GAwEpfwVH5I0WbrefPe+9F/RVOSLYLYF2roxHvZdQNhXbVT8w X-Received: by 2002:a17:902:6803:b0:1d9:167b:8e6c with SMTP id h3-20020a170902680300b001d9167b8e6cmr1427509plk.46.1707225896433; Tue, 06 Feb 2024 05:24:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707225896; cv=pass; d=google.com; s=arc-20160816; b=qkIw3yjgu6+qPvtFzolsZC2MA3djsyJ42m7pqz3Kbd54ugp3nXw4p/4jM5QTSPzDN7 Z1ne3ZZnJvHzyEJuRV3Z/InPxH6mg7J82FES1lFXtgHM2gpDhad+UPtdaZMAG0nWvJ3B YwizQ77XstYnrenw6Hi/GdjjboiVVtiBH5KlCsp2seN0BSe+rFYStrwIcD7aE785HI5F F11ybJxwnvDXY+SOmYRpfFifB1b4c7kj/otrTkM/yII5AlfzLBiKPPqUvBSSkfGVu61D OZuYXJrdzlEiDYIAUD25IauGK22j8NGfFETt5fKzkq/Q8ViSJgL7o1eMX/+LsYQ3vhLP ZeHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=RxuK4xw8pqh5yDcOGZC1UBLtUHIGb++cQtibGifwwYo=; fh=nhXwMRznLESpjwZnG8MoMyXpwITXjMxEr9hSbh7bjqM=; b=VWjBVsxzwNkfr7VmRLpQqbr1frW5RGbFETOQw7ES35qYWDrWRtLsRUZ5upfYYOKY0Y i3OQiWs7VFgo8d1N06NiYfMmNQP1wKbf5EB+mStpvStehBXJGZ/Qb0SXqTmi65VeWrbQ s1+tl0DkYdb2fhxR+eUQQViOUaUne/fuYbxkdxCOOVyR/dCjTzvRXg0E+B+lhaYcn2t+ ydWTQAXZOEcrxdrcOGyLIoanfcKvLoH/a/v9bHHsE0UHsIKrSWtFJDQr8dYmxKiELBtm 2mFUeY0mjPiWuLPUujsYFmu8PzrP+KMbIg9hHJW3EGIMGyOGxUCx01Bo4L/sP97cO9JI zYPw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DJcRQtsp; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-54935-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54935-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=1; AJvYcCWL40Cycj5JvKqOJVJj3Z5ngn00VKhVodjC/Q54hso3D7+WWzbVggDb+9v3bH02W5UUqMGGKjgEai+gEasDh8fAryGCOQ== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h2-20020a170902f7c200b001d51f6f28cesi1613706plw.142.2024.02.06.05.24.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 05:24:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54935-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DJcRQtsp; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-54935-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54935-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C0054286F49 for ; Tue, 6 Feb 2024 12:30:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C8D8E12FF9E; Tue, 6 Feb 2024 12:13:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="DJcRQtsp" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 B87781EA7A; Tue, 6 Feb 2024 12:13:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221597; cv=none; b=qUyq1sCu/rfVhtfC0g40JKhxGoi+8tCeVQv/6LJrM+gfkXg9WujhUMYWeMO6f2xU7KoVwmFsoRg8mQDf5y6hU3j7koLZ4vFwYk0mHrG6Zt4Th46PD41RlrTxEKcBRRcMr4o5Lkt3GuLdO59ZN/4WUw9hgxSXQq3VGNOGeEqNGMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221597; c=relaxed/simple; bh=Wim/IsJK6tra2KU9v5LTN8HrI8504obd37/zUH9YMYQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zp6Dia5sEQmi2QVEmDDVpYwSRNmsDDUC049G/6m8KfDV+wJ5hOqkUzJ6qamKgTuPnE9BJaK+xqSyRbC1p5+p6JzPh171A2AbrsZ9Ctg9Dm27BFux25PLOhCY1rHIqkImhTRfyihCQOfrNY9R5PKwSPntfSnixL5CbMUZz6YX0/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=DJcRQtsp; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707221594; x=1738757594; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wim/IsJK6tra2KU9v5LTN8HrI8504obd37/zUH9YMYQ=; b=DJcRQtsp2VAhMnHEIJasEz7HbNTjQw7ejyL4S/48wsDW4T+WnexJ+RlE J+EBHHlLsur1d9H5jEb1+A0cU+3h8S/yJfcQLMd4MQ3tqUXtU2l/oatbX xYS1p4U+gSg/V+CFrNCj4JlQWfSzN7br67wclXhfXujPtMFus1HkLjWob Gmho7vb72Zdfk6nu3rFCIpV2q5aHF7TyqGdk9D5ovu2D6UJylZ9JkM7G1 AAmnCs/j+4EnSmib6htJ8HP5Wb1xkKkE1myOKCdoySQLLpX+W8tWikbMC NUPpE40X4J/0+N7KUmIYiHqjBSppwTohmA8SEv4Ji1X0E4vrc4SLk+2w8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10975"; a="998426" X-IronPort-AV: E=Sophos;i="6.05,247,1701158400"; d="scan'208";a="998426" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 04:13:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,247,1701158400"; d="scan'208";a="24247467" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.2.175]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 04:13:10 -0800 From: "Fabio M. De Francesco" To: Peter Zijlstra , Dan Williams , linux-kernel@vger.kernel.org Cc: linux-cxl@vger.kernel.org, Dave Jiang , Jonathan Cameron , Ingo Molnar , "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH 1/2 v3] cleanup: Add cond_guard() to conditional guards Date: Tue, 6 Feb 2024 13:13:00 +0100 Message-ID: <20240206121301.7225-2-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206121301.7225-1-fabio.maria.de.francesco@linux.intel.com> References: <20240206121301.7225-1-fabio.maria.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790156101157032937 X-GMAIL-MSGID: 1790156101157032937 Add cond_guard() macro to conditional guards. cond_guard() is a guard to be used with the conditional variants of locks, like down_read_trylock() or mutex_lock_interruptible(). It takes a statement (or statement-expression) that is passed as its second argument. That statement (or statement-expression) is executed if waiting for a lock is interrupted or if a _trylock() fails in case of contention. Usage example: cond_guard(mutex_intr, return -EINTR, &mutex); Consistent with other usage of _guard(), locks are unlocked at the exit of the scope where cond_guard() is called. Cc: Dave Jiang Cc: Jonathan Cameron Cc: Peter Zijlstra Suggested-by: Dan Williams Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco Reviewed-by: Ira Weiny Reviewed-by: Dave Jiang --- include/linux/cleanup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index c2d09bc4f976..d70454e9f8dc 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -134,6 +134,16 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ * an anonymous instance of the (guard) class, not recommended for * conditional locks. * + * cond_guard(name, fail, args...): + * a guard to be used with the conditional variants of locks, like + * down_read_trylock() or mutex_lock_interruptible. 'fail' is a + * statement or statement-expression that is executed if waiting for a + * lock is interrupted or if a _trylock() fails in case of contention. + * + * Example: + * + * cond_guard(mutex_intr, return -EINTR, &mutex); + * * scoped_guard (name, args...) { }: * similar to CLASS(name, scope)(args), except the variable (with the * explicit name 'scope') is declard in a for-loop such that its scope is @@ -165,6 +175,11 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ #define __guard_ptr(_name) class_##_name##_lock_ptr +#define cond_guard(_name, _fail, args...) \ + CLASS(_name, scope)(args); \ + if (!__guard_ptr(_name)(&scope)) _fail; \ + else + #define scoped_guard(_name, args...) \ for (CLASS(_name, scope)(args), \ *done = NULL; __guard_ptr(_name)(&scope) && !done; done = (void *)1) From patchwork Tue Feb 6 12:13:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 197535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1659716dyb; Tue, 6 Feb 2024 08:31:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IFo7JtOs/VIs5pDhJkRQ58dcIap3AVC3H4hYtJSVaS1kBFCQWSsbL/DmbPaPPjJNGAmBCTx X-Received: by 2002:a62:ce4c:0:b0:6e0:3f77:ddc8 with SMTP id y73-20020a62ce4c000000b006e03f77ddc8mr66190pfg.3.1707237087225; Tue, 06 Feb 2024 08:31:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707237087; cv=pass; d=google.com; s=arc-20160816; b=khk7vXFLfc7hwWCsZ1WcH1oDLzKEjAYMhvC23N8uudC14Y9UWn0smW5WiVdN+xH+4W 4WP5mKBEcayToJfhHYOG4Y0s6MuDj6HFddTHrfZ1aKumdksUC6uVMLELqr/Q2b1PMdNb aGenK6mlaDgkkSpAXmBaDV2TK1KxZXIPpXCpcJU8XxQA0cYb6JO0Og+GIfY4NgC7OV3l piRDn52awtG2A6qjNIouPyNdp28P1oX4TNY/8Uuw/uqUp3Kxe1XoSsm5CwOjlt2oc0St Pxg7vUID2cjXA5U4+oiblpXfMQEL9Yrr8JeSz6N02zqLjlqz5BYFBOxBBkL4AULRS16y IIzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=NaO9m4gsGYiQGm5OiOdI179qRYq26M8hyHpUFRiZFUw=; fh=uA/jglOt/1FzCxmaitWyk4XOfcoG8XlY9GejsMga668=; b=QYbByqiCv+8MXgSwcCmv6s3HtHDO+mLqD5TelaTrGOkk600EAC4brbog3etvSjSPGo AMKBMp/mahM2DcSLXH0SmgTb3YYiT1ppxNxVKfn96pi2iYCVQHCyY3Nzgo9chy5t63tM bO5HJ1dI6m5URFZG88wa3FsxAg8V7bBoKeLLg8XuXmtQLD0+j8U0SMSIJ4Ka+VHJpQhX PNpnXkMfQ1VbwEvrqpw9a0bdzgDq1WcxL5HYjE0UH3R2i/WjV+98J3kLtA0yMHcl7qCc IHxayiEv2ClMO3/sHFvFln7ld8SUU5bkXC+9VVAG47fNYKrLgSz6zgrovSTCmnSVHnso qGaA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JkZuS+HW; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-54936-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54936-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=1; AJvYcCXWlApt8JuIJewEt+IJIinEDHk1vhtOnEYk4sYrSnkUcKHWg5vGPlRFKO53vSMBp1H4gwGRv+8zhb+q2VRyyXn2wZ6VAg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e18-20020aa79812000000b006e02672acafsi1803469pfl.38.2024.02.06.08.31.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 08:31:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54936-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JkZuS+HW; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-54936-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54936-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 87DC7B26389 for ; Tue, 6 Feb 2024 12:30:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD7F1130AC7; Tue, 6 Feb 2024 12:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JkZuS+HW" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 72C8A12FF6C; Tue, 6 Feb 2024 12:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221599; cv=none; b=p72A/v7OGYnL6/EcnwceYh0XOw/gtIGFsuA92O4YTANIAVvNEnlxk6zvZDViPE5tegzIbEEXQcM7adyS9C4aFDN24NGSEGPKjcKFXDj7LnJI3cHu942G7S7PF5JiNQuyU8ZkAG4PZ9YYwPm1mENqDGHQuhDZjERB8NqOvTaUQjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221599; c=relaxed/simple; bh=6kuESQ2JAAwpV9VqKvfTWaOUnZHmWcCYDi6kAH11nws=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OYs07CoDlobAY4g/44Ix9D8XLBIDe+voIYYVmYcJEXOfK6MwDQ7E6+XxJkMGFGY4SejbhIV6/FmGgkURE67BBpUzOge1eNMqevRv6ZKc1ykC2rJZ9tS5B1udywmwbSjluEnDbmnkqwoN2yeZhR1jTexY8bV7Uws9GDzfmT1XOyw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JkZuS+HW; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707221598; x=1738757598; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6kuESQ2JAAwpV9VqKvfTWaOUnZHmWcCYDi6kAH11nws=; b=JkZuS+HW9bAtCMd2liSEWRe4iV4sJcqchVL3rQPGN3QQFIcjQAI9yeTB yeoXtscdWD4EIh4a8YhkzLs4RkdyXLZ10WsXD6vf9P3Vw5MMrPmh6jbZl ssBAWcaSIgNfGXWsOsZJ6RiULJ2BqVa/mN8rxVbe2m5zJLtAkDqB9Sch2 RfqaV9/jPa5PWAHPznCKGMABmaMpHxL1yfEGaNijfR0ov3O1TuxXRzTLk oK7vLU9m57KVIY4aPb3DhtOQPfsghpp28QVy8FTid1xGwcstzOgdmXmfR +ht2OEkQF5Joyo7S+4HfOXDurpNiA1EjKdRzsOCV0i283lQxJmln7+Haj Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10975"; a="998442" X-IronPort-AV: E=Sophos;i="6.05,247,1701158400"; d="scan'208";a="998442" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 04:13:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,247,1701158400"; d="scan'208";a="24247479" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.2.175]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 04:13:13 -0800 From: "Fabio M. De Francesco" To: Peter Zijlstra , Dan Williams , linux-kernel@vger.kernel.org Cc: linux-cxl@vger.kernel.org, Dave Jiang , Jonathan Cameron , Ingo Molnar , "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH 2/2 v3] cxl/region: Use cond_guard() in show_targetN() Date: Tue, 6 Feb 2024 13:13:01 +0100 Message-ID: <20240206121301.7225-3-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206121301.7225-1-fabio.maria.de.francesco@linux.intel.com> References: <20240206121301.7225-1-fabio.maria.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790167835471931923 X-GMAIL-MSGID: 1790167835471931923 Use cond_guard() in show_target() to not open code an up_read() in an 'out' block. If the down_read_interruptible() fails, the statement passed to the second argument of cond_guard() returns -EINTR. Cc: Dave Jiang Cc: Peter Zijlstra Suggested-by: Dan Williams Suggested-by: Ira Weiny Reviewed-by: Jonathan Cameron Reviewed-by: Ira Weiny Signed-off-by: Fabio M. De Francesco Reviewed-by: Dave Jiang --- drivers/cxl/core/region.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 0f05692bfec3..eb5c36462c0a 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -666,28 +666,20 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos) { struct cxl_region_params *p = &cxlr->params; struct cxl_endpoint_decoder *cxled; - int rc; - rc = down_read_interruptible(&cxl_region_rwsem); - if (rc) - return rc; + cond_guard(rwsem_read_intr, return -EINTR, &cxl_region_rwsem); if (pos >= p->interleave_ways) { dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, p->interleave_ways); - rc = -ENXIO; - goto out; + return -ENXIO; } cxled = p->targets[pos]; if (!cxled) - rc = sysfs_emit(buf, "\n"); - else - rc = sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev)); -out: - up_read(&cxl_region_rwsem); + return sysfs_emit(buf, "\n"); - return rc; + return sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev)); } static int match_free_decoder(struct device *dev, void *data)