From patchwork Sat Feb 17 10:59:02 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: 13561308 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 941A159B6C; Sat, 17 Feb 2024 10:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167563; cv=none; b=iJbEN3xHJlwZHTY/CWgi50MhBnQsRmf70SkDiGe3N/ZJ1l4E1wyekyG21aom99LrzIkJ7iCjQPtIO/hNi95Au43ujVnITKvkBykwpeoRRVYjPMZOOxMFoks03bv9ivz+9alNaVhPyxjwcICDzr7uYCmUoHamVuuYaagQi40h3R0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167563; c=relaxed/simple; bh=XF+WjLg4KIqsngigqVAPUzNcgTjwiRifxdEA0ayezwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AyJxdjDF+6rh2PUWKw0s7z0WMEPYjeKnlkXvTL++MUecfcJQH1aAyMX3UrgPfx1uNqR/WAjoRujnnQXoxouVlom1ZBhhaSaRq7cUqG11NRXmd1YtByGYDJq+/fGjHyBSyRBumFS60LaC1o9p81ZbZa7I9Yrhu5pSqng+fmIpHPo= 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=H+MpTSB+; arc=none smtp.client-ip=192.198.163.7 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="H+MpTSB+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708167561; x=1739703561; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XF+WjLg4KIqsngigqVAPUzNcgTjwiRifxdEA0ayezwg=; b=H+MpTSB+GsqBssNOGC8aQYTz+CJXwIXdmpFEWVwO5mhPP2PMpBlrL2Wj QrmtPbIPtiJSwlkZUELavPjaTbth9Fx2J6uoZC49B9/BLuk8Djp+3Sog9 w/WsyVmjY07/ir3wnjRtRlsvEC5/srBFfnW6yEr4kkCpv/9pwgEUVitaA EkRQYfZ5M+ClGgor4wR3Z/P65YBXNgo71tZIsy7M2wEIkH27E+utmGzRr Vk7xIfgcI3f7stLND9DtTWvQq6inn/ZBqR3+mgQdkWs1Cz2ipcZQeBdAI OonjokmdGz0zlmQLD+cbK57iQWjw8t0R/J2mAGTmRje92PnyEmB3HHFYh g==; X-IronPort-AV: E=McAfee;i="6600,9927,10986"; a="27746704" X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="27746704" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="4348712" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.3.209]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:18 -0800 From: "Fabio M. De Francesco" To: Peter Zijlstra , Dan Williams , linux-kernel@vger.kernel.org Cc: linux-cxl@vger.kernel.org, Ingo Molnar , Dave Jiang , Jonathan Cameron , Ira Weiny , "Fabio M. De Francesco" Subject: [PATCH 1/3 v5] cleanup: Add cond_guard() to conditional guards Date: Sat, 17 Feb 2024 11:59:02 +0100 Message-ID: <20240217105904.1912368-2-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> References: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. This macro can be called multiple times in the same scope. Cc: Dave Jiang Cc: Peter Zijlstra Suggested-by: Dan Williams Suggested-by: Ira Weiny Suggested-by: Jonathan Cameron Signed-off-by: Fabio M. De Francesco Reviewed-by: Jonathan Cameron Reviewed-by: Dave Jiang --- include/linux/cleanup.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index c2d09bc4f976..602afb85da34 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -134,6 +134,19 @@ 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); + * + * This macro can be called multiple times in the same scope, for it + * declares unique instances of type 'name'. + * * 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 +178,13 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ #define __guard_ptr(_name) class_##_name##_lock_ptr +#define __cond_guard(__unique, _name, _fail, args...) \ + CLASS(_name, __unique)(args); \ + if (!__guard_ptr(_name)(&__unique)) _fail; \ + else { } +#define cond_guard(_name, _fail, args...) \ + __cond_guard(__UNIQUE_ID(scope), _name, _fail, args) + #define scoped_guard(_name, args...) \ for (CLASS(_name, scope)(args), \ *done = NULL; __guard_ptr(_name)(&scope) && !done; done = (void *)1) From patchwork Sat Feb 17 10:59:03 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: 13561309 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 1FC5B5EE78; Sat, 17 Feb 2024 10:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167566; cv=none; b=pPZvrvH4/F9w5QxG4huKE4QH4PH3qLH9ON9GyfAqYoZtVB5DsSU7fBDtuHIkpta/zxmoB4BOjHdq+5TAQkoRwQsa0YPw9kTV1ZV3Z0JMHa/01VD0Tpz2ltNpwGEAGS3OoN5f7qen/4h3KnJ+tLmbkw9zM7WIT4mtAld2CSL4GJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167566; c=relaxed/simple; bh=tReqAs6fZ7zrpLVpBj5aMUSuggIHwZZRptD6FzY8tlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AigoqT3cYoeqZzX2YPn0JHMOd8Mjt25G1mYSX7/yaqfcdtuIu5PYJ2LEilQlSUlHZ8cQaJRe6UQK9WKLViOuDzH309+W9WJhH8acP8q8HMQi8/N0fO/oIU4xJSGOyXqnHA0HQk0ur8aL+gWVNKvGystjtSgHq+qr/Z6zV6T5yrU= 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=ei9bSHA5; arc=none smtp.client-ip=192.198.163.7 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ei9bSHA5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708167565; x=1739703565; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tReqAs6fZ7zrpLVpBj5aMUSuggIHwZZRptD6FzY8tlA=; b=ei9bSHA5SrZ//3K2d8100vpikATXFyYliYcfHnoxkfn2IFP3vOzM5YNk EOvwchIA1pimOsMGarVyJI8tIXvGrMm8yjbX36He+dHBhFQu+i6yB/NpU Z6GpcEWLGHourpLIwNMM1iaQLA4ZO1GK3WiC9xgpOjGe1dO/wRQ1rnbWK 3CzNZbQ+VEhMhVyIjw9Pgn+869+D8v38NHKF1gKX44Y8vcBHByDh1/sVC 8BFrKJdq3PqnbspDQ80CSOnYgjP/YUkZUv0ixWoGTxVuHIzZsGPr5+ROj nksGxW8iBfrByxIvlsWaS4Ut9r20CNupEhlSIRxpj8a46X5nyxOJUHzoz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10986"; a="27746710" X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="27746710" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="4348726" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.3.209]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:21 -0800 From: "Fabio M. De Francesco" To: Peter Zijlstra , Dan Williams , linux-kernel@vger.kernel.org Cc: linux-cxl@vger.kernel.org, Ingo Molnar , Dave Jiang , Jonathan Cameron , Ira Weiny , "Fabio M. De Francesco" Subject: [PATCH 2/3 v5] cxl/region: Use cond_guard() in show_targetN() Date: Sat, 17 Feb 2024 11:59:03 +0100 Message-ID: <20240217105904.1912368-3-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> References: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Peter Zijlstra Suggested-by: Dan Williams Suggested-by: Ira Weiny Reviewed-by: Dave Jiang Reviewed-by: Ira Weiny Reviewed-by: Jonathan Cameron Signed-off-by: Fabio M. De Francesco --- 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 ce0e2d82bb2b..704102f75c14 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) From patchwork Sat Feb 17 10:59:04 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: 13561310 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 DF7BC60BBA; Sat, 17 Feb 2024 10:59:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167570; cv=none; b=XI1DVRfoU9nkW0QReMmctT+U57FxtvM/sLtQUTg+nx+hTQNa4vrGDARsAmUKCcS+uYpmuE4E07YyjsWIZEmPy1s0QfulNJrW/DPyuO7D/47DSMjPj2nEbP5e34/sRIHOr9Ca0SXnTrzZCNkZ8juPDW3k2vGLNUW1cw2rsJNeO6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708167570; c=relaxed/simple; bh=Rg9lLhRXKxcDqABXuFQf8jwhkLJkiGL2KthCj4b7KB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aP593LR5z1vEDAcPEOsPokPXC6HcuhMff8pFFl377rNCBRfqltOZhIpuFuwmvjxdZJVKR1PstblBv0EFYmUEjvsNvI1oTCZIw8xHIXPSfKMUNxkcko9yqtLU5xeJHZPbFD1Z8or/QTyEjqv2iWftiT5zsA/N/GS7zdfbwrRcjR4= 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=XVlyEtFs; arc=none smtp.client-ip=192.198.163.7 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="XVlyEtFs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708167569; x=1739703569; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Rg9lLhRXKxcDqABXuFQf8jwhkLJkiGL2KthCj4b7KB8=; b=XVlyEtFsdA8o+E4MI0HYNcLutkco/64tCA6bLq7ZxqRY0zZcd7m4UKc7 EGMaZhuy8qAOnGO6MBVcLfPtmpT3fik3HqrX0qWA9El/FhP3DCORtsjIX yNMe3er52pPvqeKY9fWP8nPntnLDZ+IEBsKM4T+z7q6cctEvUSbTjkQJ3 i9CeDN4Udy9/mLBJKkah+G9caSCgBTTOUb8VeQUqzY0VXlpWKYKX11EEz pWULYGvimmy+NivjuTrnXtLzgFqHBrasXDiQLMvTn0LYwFBK7BuaqX1YN ojGiZK/oZZS1ne1bzbhgAlPxYeQhGvsGjgVCRSFwMmN5K1aHagESWo3Oj g==; X-IronPort-AV: E=McAfee;i="6600,9927,10986"; a="27746715" X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="27746715" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,166,1705392000"; d="scan'208";a="4348739" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.3.209]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2024 02:59:25 -0800 From: "Fabio M. De Francesco" To: Peter Zijlstra , Dan Williams , linux-kernel@vger.kernel.org Cc: linux-cxl@vger.kernel.org, Ingo Molnar , Dave Jiang , Jonathan Cameron , Ira Weiny , "Fabio M. De Francesco" Subject: [PATCH 3/3 v5] cxl/memdev: Use cond_guard() in cxl_inject_poison() Date: Sat, 17 Feb 2024 11:59:04 +0100 Message-ID: <20240217105904.1912368-4-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> References: <20240217105904.1912368-1-fabio.maria.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use cond_guard() in cxl_inject_poison() to not open code two up_write() in an 'out' block. If the down_read_interruptible() fail, the statements passed as the second argument of cond_guard() return -EINTR. 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: Jonathan Cameron Reviewed-by: Dave Jiang --- drivers/cxl/core/memdev.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index dae8802ecdb0..bd97eea65bb0 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -331,19 +331,13 @@ int cxl_inject_poison(struct cxl_memdev *cxlmd, u64 dpa) if (!IS_ENABLED(CONFIG_DEBUG_FS)) return 0; - rc = down_read_interruptible(&cxl_region_rwsem); - if (rc) - return rc; + cond_guard(rwsem_read_intr, return -EINTR, &cxl_region_rwsem); - rc = down_read_interruptible(&cxl_dpa_rwsem); - if (rc) { - up_read(&cxl_region_rwsem); - return rc; - } + cond_guard(rwsem_read_intr, return -EINTR, &cxl_dpa_rwsem); rc = cxl_validate_poison_dpa(cxlmd, dpa); if (rc) - goto out; + return rc; inject.address = cpu_to_le64(dpa); mbox_cmd = (struct cxl_mbox_cmd) { @@ -353,7 +347,7 @@ int cxl_inject_poison(struct cxl_memdev *cxlmd, u64 dpa) }; rc = cxl_internal_send_cmd(mds, &mbox_cmd); if (rc) - goto out; + return rc; cxlr = cxl_dpa_to_region(cxlmd, dpa); if (cxlr) @@ -366,11 +360,8 @@ int cxl_inject_poison(struct cxl_memdev *cxlmd, u64 dpa) .length = cpu_to_le32(1), }; trace_cxl_poison(cxlmd, cxlr, &record, 0, 0, CXL_POISON_TRACE_INJECT); -out: - up_read(&cxl_dpa_rwsem); - up_read(&cxl_region_rwsem); - return rc; + return 0; } EXPORT_SYMBOL_NS_GPL(cxl_inject_poison, CXL);