Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 7 Sep 2022 22:55:46 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Robert Richter <rrichter@amd.com>,
        Alison Schofield <alison.schofield@intel.com>,
        Vishal Verma <vishal.l.verma@intel.com>,
        "Ira Weiny" <ira.weiny@intel.com>,
        Ben Widawsky <bwidawsk@kernel.org>,
        "Dan Williams" <dan.j.williams@intel.com>
CC:     <linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Len Brown <lenb@kernel.org>, Robert Richter <rrichter@amd.com>
Subject: RE: [PATCH 04/15] cxl: Unify debug messages when calling
 devm_cxl_add_dport()
Message-ID: <631983e2bc50f_58016294a3@dwillia2-xfh.jf.intel.com.notmuch>
References: <20220831081603.3415-1-rrichter@amd.com>
 <20220831081603.3415-5-rrichter@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220831081603.3415-5-rrichter@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PELTG2ErZlcSNLh0g+XODx3SWvxiXwzmF2K1lbOPuHKBjYuwd6L4jv75/uD5?=
 =?us-ascii?Q?UZ5x2/IpdVuxzhxdmG298y2Wj6Hl1eAzVPnGx4v5N8qpSvoYMS6k4Aw85lVe?=
 =?us-ascii?Q?2uBL+nccSl1chQFQ0adAlkwih0LR+3/KnYGox2Y/uiMWck59LQ6aHlOqfuWZ?=
 =?us-ascii?Q?sB5yU4hJ9XQLnteQSWEN6n2SDgCCGTDV4WjsIa/x206pLwpm7AaYTjxYhJgU?=
 =?us-ascii?Q?KlvlUZG8Xo1KxZNFsVDOOgA3btXxHEd6XiCVhb5UTzquhojtVQNWHeT40GIP?=
 =?us-ascii?Q?6aIJTLcbwA7Xum5kb/GoAXIKRnBkCJblORqFPBol4TQmHZqKmt7coq0BXhCX?=
 =?us-ascii?Q?5D2SLOUjM1eez7TfTHm4EQs7qD1NES/Cy3EVX4n4fTYEYeo5vE37nQNjEdd2?=
 =?us-ascii?Q?wZdRqn8PaiJC81rM0FUUWGKEHklx3QI8cnUX0KzmXgCamTMi2CCdL226x3Ex?=
 =?us-ascii?Q?H+zbr7HlLz6Ryx3kd64vFwO1S5l/TQJmWt7uINUoxfexwu1nfHJQ2E1qOPx2?=
 =?us-ascii?Q?KcmbL4pJcN6J5XonUR3M3QAahc3trTuXPsyBapM0iT2SB+q/OsANqELbMWjg?=
 =?us-ascii?Q?Cwh5uqDmn7937XB0LwdOcI9c/ZgJbUGiSjWsnjF1rqJMw/+WWpnuWttabdkr?=
 =?us-ascii?Q?G31VNN4AeGnNLhTlNSj2CA/DnsKFsTNbtR0Pd+r7Hn/dQQiLcAU5KeXOcKoX?=
 =?us-ascii?Q?0OqVl3exGRTYUs0YurJsOi4aihQFIJdK6qJU3Y/uKk+gzjkkmevkaMsbs4Vb?=
 =?us-ascii?Q?EyQL+usGBxjqx58bUDAhVXwI19GMBvMYU/FApiydvJy/mAFhSKr2usVj/fJS?=
 =?us-ascii?Q?xfjrPsL2whr5g5y7DpmR5xRAyy6ObasVOPvnf+jgPnbLYF2Km5n77dlssghv?=
 =?us-ascii?Q?tT5PuEWlXQ+elgwg8OSVs4/CYEc2VNF90EruM03DrDDkHF/bs9JMWYZF1f9c?=
 =?us-ascii?Q?j9U3wezo15rc6GyT9FCKv+GjVaJaGtIyZrh+xNBAeDJnCEYgnH0U/TqNeVKv?=
 =?us-ascii?Q?bNutGJoZ5SCM2ZeWNx3SuNrBzWrSpB7bW8A0pPLu2NrSuZRbCIpJj3HcRv92?=
 =?us-ascii?Q?VGlQMp6ipLU4DHOqB/jRaInivoODPBO614vskOZtpAjCwSBJIqkSxWalOjof?=
 =?us-ascii?Q?HDcSOLG7PRMcmOXjYbgPd97bmCi6GvZ7yRk9VfevFrzKSVuBI+/Tp1zrh2pM?=
 =?us-ascii?Q?0wM6xOkKj3ev0m4wXv4bGi08i2PyrMW/1iWrERakEf/9Z0ijqLbG8xXU1aF5?=
 =?us-ascii?Q?N3XkAaRCBoT+DS5Mhyhh2wcmg/zjXuREoMRmcAvY4ajZCt0GihyeTApstU7T?=
 =?us-ascii?Q?pn7RZ0aRNMnRbdYyF5vE0cMmToCL9Ir/CvnD7+I0p33ZbgvE/4AHBNSVNYXl?=
 =?us-ascii?Q?uuemP4G5nQjAeDUWR14A1lGseE0l9aPNYTbL4D6z4ZzMNlQRDcfkf3DOFC0g?=
 =?us-ascii?Q?L5m3uX8VSTua6/CW65qkiw79qlOVHu7Un0c1yBb9D/ou12qdF2h8jVGDuNqI?=
 =?us-ascii?Q?lUtHRiTaayiN4vrasYxu/7WOi+U02zQXaIJXe+h2rZDgtIMCpCzppdEFQ6Ie?=
 =?us-ascii?Q?R/4iXhA19XZxmcIe8xOaosxgnLXkIXZfLuGkUburBA2yo9OxDVTvFhnj1W2T?=
 =?us-ascii?Q?Sw=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 59925a12-23d1-4eb0-aec6-08da915ec7cc
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 05:55:49.2786
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: X4UctMp1GE/2xyAbeTy1ptWUyhW0iXC7bIo4sIuZN4+j7/ZkczyXVjR36eEhVd06ICCUn+DFLzcg+wa9yfDrlqreNRv2mluNFPX072TJLdY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4426
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Robert Richter wrote:
> CXL dports are added in a couple of code paths using
> devm_cxl_add_dport(). Debug messages are individually generated, but
> are incomplete and inconsistent. Change this by moving its generation
> to devm_cxl_add_dport(). This unifies the messages and reduces code
> duplication. Also, generate messages on failure.
> 
> Signed-off-by: Robert Richter <rrichter@amd.com>
> ---
>  drivers/cxl/acpi.c           |  7 ++-----
>  drivers/cxl/core/pci.c       |  2 --
>  drivers/cxl/core/port.c      | 28 ++++++++++++++++++++--------
>  tools/testing/cxl/test/cxl.c |  8 +-------
>  4 files changed, 23 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
> index 767a91f44221..31e104f0210f 100644
> --- a/drivers/cxl/acpi.c
> +++ b/drivers/cxl/acpi.c
> @@ -282,12 +282,9 @@ static int add_host_bridge_dport(struct device *match, void *arg)
>  	}
>  
>  	dport = devm_cxl_add_dport(root_port, match, uid, ctx.chbcr);
> -	if (IS_ERR(dport)) {
> -		dev_err(host, "failed to add downstream port: %s\n",
> -			dev_name(match));
> +	if (IS_ERR(dport))
>  		return PTR_ERR(dport);
> -	}
> -	dev_dbg(host, "add dport%llu: %s\n", uid, dev_name(match));
> +
>  	return 0;
>  }
>  
> diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
> index 9240df53ed87..0dbbe8d39b07 100644
> --- a/drivers/cxl/core/pci.c
> +++ b/drivers/cxl/core/pci.c
> @@ -62,8 +62,6 @@ static int match_add_dports(struct pci_dev *pdev, void *data)
>  	}
>  	ctx->count++;
>  
> -	dev_dbg(&port->dev, "add dport%d: %s\n", port_num, dev_name(&pdev->dev));
> -
>  	return 0;
>  }
>  
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index 8604cda88787..61e9915162d5 100644
> --- a/drivers/cxl/core/port.c
> +++ b/drivers/cxl/core/port.c
> @@ -914,12 +914,16 @@ struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port,
>  	}
>  
>  	if (snprintf(link_name, CXL_TARGET_STRLEN, "dport%d", port_id) >=
> -	    CXL_TARGET_STRLEN)
> -		return ERR_PTR(-EINVAL);
> +	    CXL_TARGET_STRLEN) {
> +		rc = -EINVAL;
> +		goto err;
> +	}
>  
>  	dport = devm_kzalloc(host, sizeof(*dport), GFP_KERNEL);
> -	if (!dport)
> -		return ERR_PTR(-ENOMEM);
> +	if (!dport) {
> +		rc = -ENOMEM;
> +		goto err;
> +	}

Similar comment as before of using a goto just to ensure the log message
is called, I suspect a wrapper to do the logging ends up with less code
thrash.