From nobody Sat Jul 20 19:59:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRHSH5p1zz5N3w6; Sat, 20 Jul 2024 19:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRHSH46M1z4vTW; Sat, 20 Jul 2024 19:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721505567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h48uvjk67IQKYFTfsM2Rz4rH2rxxQNYbLdCIVe5E674=; b=Y6hVHEN7LYquJP5k6VLSHCm7og/t/wMg3M6RgXWQJn3UxjKZlhl9uzr9Zhw6Do19i9yOGN sC7NuznyWMjH5yzmQvuCGfTiklpQmtknsjmFU2Qqa9cSwoPwh2RLzYI63LVkFMhBUUc+ly NVTMiaSNi6QSNfga8v6F2LTzf8wr6hkcuzk0jvF9kLbfnlhOIn3U1IQGnoOvu7i0tzlExz 1lTLAGa4YkkZTd/N6QdxVCnz5/ZNEjkAj4Fo/seI1W1tubcNcOjMPTlLw5wFvJCBYpra3v iqcHTSZpBhvzlss+DxBX2jkIEzH2spp/I/jQp0vTCG96ivVErW6Pxo09s873kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721505567; a=rsa-sha256; cv=none; b=xNrtLVNrxvj1zDTs7S2n4HRPHCF46qGbQRc+HZLrAdxQd0GjDSk8NvjbrUYR2AOPTR+jkt ssA4mDS+aoyZLGhel3ZmISLCKXX212KvpVZcDUoaQCnbzdqZmasNvbV6QYDJMosk6BZjeQ eFF/kX3tyRwfdzBLydAeEt3atJuPmavWafqSBGdbbf2ceEBGholEjrSLc+Sz7KchO/hFxY Hf9MM8Pj9QJchzZq1rUNpj3h8VORObqoikh9jM40Qkfd3DA8KPidZAFOc3NuLe4/JM2sTc sdKQlFNzmmVGkC+llWGiiL5+X7aXbnb8tZq5Nuc9MajaoJVZnGnGZy+crFNEhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721505567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h48uvjk67IQKYFTfsM2Rz4rH2rxxQNYbLdCIVe5E674=; b=vRul/h+yb2W9kOzyX8jeHkD6XmKcQxc8PwKbpX+EoXUZ33FodEfxlYQhLaCZKTdLcjU1lz CwlGD5l1rgFj8eE8KEwxCsV55Ua+4+gD33H/8GZNUYsrdbbs/x1nixeU8OlpagLD1TJBJM RR7ItOwWGxGxzqzSZHy/tUM/ee2RtCAAHycgoJCVepvi3wJj9R3+nCgfcRO1VK7N6TRF7H nCAWr8dji51SeyuT/tNl++SPFEm3r+IFMxfNlGZ8Sbf29IWLYde84bfDjy2bLV/EPiQY2A fQd94yUs3nf8pFAyim4dj4Ykhzj0CeHhLmu/P1pbuR8QvSN1ctFSDjHA7h7wvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRHSH3FXDzVkZ; Sat, 20 Jul 2024 19:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46KJxRJK052608; Sat, 20 Jul 2024 19:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46KJxRlN052605; Sat, 20 Jul 2024 19:59:27 GMT (envelope-from git) Date: Sat, 20 Jul 2024 19:59:27 GMT Message-Id: <202407201959.46KJxRlN052605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d3795c1d72f0 - main - cam/iosched: Use better malloc idiom List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3795c1d72f042c86efebdaa9ae790f64ef79f47 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d3795c1d72f042c86efebdaa9ae790f64ef79f47 commit d3795c1d72f042c86efebdaa9ae790f64ef79f47 Author: Warner Losh AuthorDate: 2024-07-20 19:58:04 +0000 Commit: Warner Losh CommitDate: 2024-07-20 19:59:18 +0000 cam/iosched: Use better malloc idiom Allocate to a simple poiter, use that everywhere, then return it at the end. The code looks cleaner. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46043 --- sys/cam/cam_iosched.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 4f4a2b2cde55..15e98b7cb39d 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -1160,37 +1160,39 @@ int cam_iosched_init(struct cam_iosched_softc **iscp, struct cam_periph *periph, const struct disk *dp, cam_iosched_schedule_t schedfnc) { + struct cam_iosched_softc *isc; - *iscp = malloc(sizeof(**iscp), M_CAMSCHED, M_NOWAIT | M_ZERO); - if (*iscp == NULL) + isc = malloc(sizeof(*isc), M_CAMSCHED, M_NOWAIT | M_ZERO); + if (isc == NULL) return ENOMEM; - (*iscp)->disk = dp; - (*iscp)->schedfnc = schedfnc; + isc->disk = dp; + isc->schedfnc = schedfnc; #ifdef CAM_IOSCHED_DYNAMIC if (iosched_debug) - printf("CAM IOSCHEDULER Allocating entry at %p\n", *iscp); + printf("CAM IOSCHEDULER Allocating entry at %p\n", isc); #endif - (*iscp)->sort_io_queue = -1; - bioq_init(&(*iscp)->bio_queue); - bioq_init(&(*iscp)->trim_queue); + isc->sort_io_queue = -1; + bioq_init(&isc->bio_queue); + bioq_init(&isc->trim_queue); #ifdef CAM_IOSCHED_DYNAMIC if (do_dynamic_iosched) { - bioq_init(&(*iscp)->write_queue); - (*iscp)->read_bias = default_read_bias; - (*iscp)->current_read_bias = 0; - (*iscp)->quanta = min(hz, 200); - cam_iosched_iop_stats_init(*iscp, &(*iscp)->read_stats); - cam_iosched_iop_stats_init(*iscp, &(*iscp)->write_stats); - cam_iosched_iop_stats_init(*iscp, &(*iscp)->trim_stats); - (*iscp)->trim_stats.max = 1; /* Trims are special: one at a time for now */ - (*iscp)->last_time = sbinuptime(); - callout_init_mtx(&(*iscp)->ticker, cam_periph_mtx(periph), 0); - (*iscp)->periph = periph; - cam_iosched_cl_init(&(*iscp)->cl, *iscp); - callout_reset(&(*iscp)->ticker, hz / (*iscp)->quanta, cam_iosched_ticker, *iscp); - (*iscp)->flags |= CAM_IOSCHED_FLAG_CALLOUT_ACTIVE; + bioq_init(&isc->write_queue); + isc->read_bias = default_read_bias; + isc->current_read_bias = 0; + isc->quanta = min(hz, 200); + cam_iosched_iop_stats_init(isc, &isc->read_stats); + cam_iosched_iop_stats_init(isc, &isc->write_stats); + cam_iosched_iop_stats_init(isc, &isc->trim_stats); + isc->trim_stats.max = 1; /* Trims are special: one at a time for now */ + isc->last_time = sbinuptime(); + callout_init_mtx(&isc->ticker, cam_periph_mtx(periph), 0); + isc->periph = periph; + cam_iosched_cl_init(&isc->cl, isc); + callout_reset(&isc->ticker, hz / isc->quanta, cam_iosched_ticker, isc); + isc->flags |= CAM_IOSCHED_FLAG_CALLOUT_ACTIVE; } #endif + *iscp = isc; return 0; }