From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E18922DA0A for ; Mon, 23 Jun 2025 08:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750667934; cv=none; b=rE8NkQoR5DHDAVKRahs00dDlOLY+jklwGxl1V72TKgWT7DFZZ2MzzW52/VxGRzLrxVjxrGIrYO9zlemkYRcR4epl9GzmjO4iPKnxcq/KIDt/u/WvtF5lmwQexmFqqWnL73h/S5YIH7PHdXo9qaywS+ml9p1YinkuqZIBZ1a/vAs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750667934; c=relaxed/simple; bh=KPTfA+lD82RyS97lfltBlDwFaXpnQXlrck43kgnV2pA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hBw5bdH51gdi73bL6/4JTHSGZPk1OMbafu0R+FpYqqpcFk0ryGANpKp8HopbJ8YVeTBIM8BGiDq1I8p92K4InWm9vezetzpWaqHk9OLb+ThAFnD5UQdu++VxNUkPsgG564hvYlqKlRDx85Kv8EmWuSyqortOW3n/+LtaAgIH4JY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cMZBQnHO; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cMZBQnHO" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-747abb3cd0bso2659698b3a.1 for ; Mon, 23 Jun 2025 01:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750667933; x=1751272733; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PyVVTWaZgryZ9TMNe9jpkxLwz3WmJyduY+dRovtnePo=; b=cMZBQnHOZt/IhbQJWqkPZeIRIbqvZ7NOQD4M3VToCJuRcDZGftGcV4HefInhV/BHtc wEOLAZ1XA0k5plQ04YqkXv1BvplcMgTrHJQp0JZolCj7EdgXeD4n0FC4QX6aIVflRott dzTjGvZSHUvf9IoaeuLOttIKp7CQCnR/HzCyiQUemypZuRpT6qglZTPGtj3r+sCrr467 s2ZirRqu5ELEcdVFVag9iYy5DHpT8XzMZzZXIXN6Sayb/mLPDxU56szgQBCBHAoiy3yv +xb/uhZ0ruryQmJs7rAGnTWdF3WYwniIX3GLtu3Uuy304+eVnFDHi4itrdlejz/OSH7y lk5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750667933; x=1751272733; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PyVVTWaZgryZ9TMNe9jpkxLwz3WmJyduY+dRovtnePo=; b=AwHvht8OPiV4+e2CSPzM6ovCGaogdXq4ZBhRy5bl6gDreNVBrG0CF19pvf1AKDE3Qu w1CbQAfVxYxeErb/z5Ru/smGl0kU//hCaRC8Onl6e88MYWoFzeS1mvHJeBNsyz1NrQh1 GSscdEhh6s0jx9Wc7KSvY8I18ulkHQeqtx47BWIVJXRSXg934HK75qkGMqyUctRD+dn6 LuQ4upEz+2u6DWiFkbBTceLqctLHWjFVmsrv7AUMkoLfpt9bQmwNjlIloXglNsS+rWfF XWz94d7mexHOGAc3jcdDRIuIbfBcTARU+J9s7Ym0Y2leoCDcWY8tP/a+kSu7jR9YjRqR ycVg== X-Forwarded-Encrypted: i=1; AJvYcCXtelEw+jZuGSHbBrS0ffLhidxAokWhOGR8Vy0L8fgTGdRIAvWheBwd8trR8eDoInpLt4DItJj18iKV2MBpXogJ6ogDcg==@lists.linux.dev X-Gm-Message-State: AOJu0YxO4zenr1ymkhvtOfVxx2qIZD3inQFB30kADbmPubqo00F9miLf hu2ik43vmJcXDLjfONe3AJLiLSoPgi9sS5pA2Ud1BK9l20qhd1dJzni3 X-Gm-Gg: ASbGnctLdME+EEAlMjMIP4uluQsm7R4y7oqZYSWU4So+PVAFpeYK7ECIOAoP6p8xP4X P9EGKbB+PPDxqgePTcOfF3Oq9nFJaz+gTw0gPYPm3HjYhr9SDgLCUdNyDu8lcXZqYtdJl2uPspm KIFKgfR7aMIrZAfMH+Lu+EHLJnu8E5RlJ9qGgEpxUPaS5cCYw1PsuNG8kXminNpmb3+8FtCYJ5d 75bb6ro6KIo7egFf4dRDPAJWZBzpaQo1tgByiltXbemmwBs8TZawjgkutWatGI1nL5x3J38iH4M Q/fiMw6XDzERGH8hipm1oLkkuRozOfFSC8lU8fQPTAJa0I1kk23ULQ/qVv036FCRStWcGcPTDju QwJEwbmo= X-Google-Smtp-Source: AGHT+IGUeFiCv00KVBMrpOmKRu6YCsOh3f2syfhlZ6O0RFPGj97gwW+e+gn6L9Eq8La3deVTY0MrQA== X-Received: by 2002:a05:6a21:6d91:b0:1ee:ab52:b8cc with SMTP id adf61e73a8af0-2202934b9e0mr18197566637.21.1750667932543; Mon, 23 Jun 2025 01:38:52 -0700 (PDT) Received: from manjaro.domain.name ([2401:4900:1c66:8091:47dd:9377:3ab1:4e4c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b31f1258b55sm6209442a12.61.2025.06.23.01.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 01:38:52 -0700 (PDT) From: Pranav Tyagi To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ming.li@zohomail.com, rrichter@amd.com, peterz@infradead.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, Pranav Tyagi Subject: [PATCH v2] cxl/memdev: automate cleanup with __free() Date: Mon, 23 Jun 2025 14:08:41 +0530 Message-ID: <20250623083841.364002-1-pranav.tyagi03@gmail.com> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-kernel-mentees@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use the scope based resource management (defined in linux/cleanup.h) to automate the lifetime control of struct cxl_mbox_transfer_fw. This eliminates explicit kfree() calls and makes the code more robust and maintainable in presence of early returns. Signed-off-by: Pranav Tyagi --- drivers/cxl/core/memdev.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index f88a13adf7fa..38f4449f9740 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "trace.h" #include "core.h" @@ -802,11 +803,10 @@ static int cxl_mem_activate_fw(struct cxl_memdev_state *mds, int slot) static int cxl_mem_abort_fw_xfer(struct cxl_memdev_state *mds) { struct cxl_mailbox *cxl_mbox = &mds->cxlds.cxl_mbox; - struct cxl_mbox_transfer_fw *transfer; struct cxl_mbox_cmd mbox_cmd; - int rc; - - transfer = kzalloc(struct_size(transfer, data, 0), GFP_KERNEL); + + struct cxl_mbox_transfer_fw *transfer __free(kfree) = + kzalloc(struct_size(transfer, data, 0), GFP_KERNEL); if (!transfer) return -ENOMEM; @@ -821,9 +821,7 @@ static int cxl_mem_abort_fw_xfer(struct cxl_memdev_state *mds) transfer->action = CXL_FW_TRANSFER_ACTION_ABORT; - rc = cxl_internal_send_cmd(cxl_mbox, &mbox_cmd); - kfree(transfer); - return rc; + return cxl_internal_send_cmd(cxl_mbox, &mbox_cmd); } static void cxl_fw_cleanup(struct fw_upload *fwl) @@ -880,7 +878,7 @@ static enum fw_upload_err cxl_fw_write(struct fw_upload *fwl, const u8 *data, struct cxl_dev_state *cxlds = &mds->cxlds; struct cxl_mailbox *cxl_mbox = &cxlds->cxl_mbox; struct cxl_memdev *cxlmd = cxlds->cxlmd; - struct cxl_mbox_transfer_fw *transfer; + struct cxl_mbox_transfer_fw *transfer __free(kfree); struct cxl_mbox_cmd mbox_cmd; u32 cur_size, remaining; size_t size_in; @@ -949,7 +947,7 @@ static enum fw_upload_err cxl_fw_write(struct fw_upload *fwl, const u8 *data, rc = cxl_internal_send_cmd(cxl_mbox, &mbox_cmd); if (rc < 0) { rc = FW_UPLOAD_ERR_RW_ERROR; - goto out_free; + return rc; } *written = cur_size; @@ -963,14 +961,11 @@ static enum fw_upload_err cxl_fw_write(struct fw_upload *fwl, const u8 *data, dev_err(&cxlmd->dev, "Error activating firmware: %d\n", rc); rc = FW_UPLOAD_ERR_HW_ERROR; - goto out_free; + return rc; } } rc = FW_UPLOAD_ERR_NONE; - -out_free: - kfree(transfer); return rc; } -- 2.49.0