Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp564916pxa; Tue, 11 Aug 2020 09:31:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLXH2pkpPzjfd4rWCTFjgrDRXN3yniXL1+KO0MJ0DfccxhMKfToWsa/+Ug9m4Chdoi23GO X-Received: by 2002:a05:6402:1855:: with SMTP id v21mr27625238edy.355.1597163506029; Tue, 11 Aug 2020 09:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597163506; cv=none; d=google.com; s=arc-20160816; b=Nf1JERI6quWfwzGVB+c2iyLSRrpdXwbw1qpxXkB2x0S0mqYY+B7chdZVnkT8K6BCo7 YwAbnH8jTsY8B22ETnB/OfyFbqqOCKKfkIFqDdXSukvT+DuA5z3elpbv/cFA1j0zucJr sVL2UMjBMvTcTumLMG8VgqUNeTSvuv14imc+zLenauAqiTZo2Kj2EIwKdoOl3goLOOp6 vhGxNs+d43NPN1nO3VJ07ASM19iR4X7WHisvUE2g6KfqIEjVFYIedG8bZcsB0qQy89GB zx4fQysJ8KcGpJ8dUJ9sOC6OQDu3KpTTOUbGkHaQzBBe3H/ko750MXkUXidvTwHoJmKJ r7aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=9oZFtHFGS12fsKR4s9JdDZfZ4H3zJ6lTE1MMdNnlQnQ=; b=WwJFHpg8OPjwOr7mwL34D2isfMAmwJL/VfFAUkcyQ1hMFqDhRxPHnqTC6Z8EJVaoqZ Pnu0qVEV4dfVGqD8WacgwbxP2Rin+o9UG70ygy2ywBUMAZ4vRTRmiUAKqhBRzXkVDfOp nm7Lf7KbwVde7FNb7pymiHhJ0AyWqVjXOlP31EpsQqkJCJndF198mWa3Kht09KPwCe8e qkVxkNB7uX5v1QrCDwc1+mt3dGsgOpLgr+S6L2xUsn272hF14JYaLgFe61vD/cVjnGr0 rqYhAfJqCDG/1L787IWIRzSqR+ep1mKhmxNS5ChBy2PLkTrOOBUFmlsQ16kOhvLKajCd 7OIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g22si3756858edm.555.2020.08.11.09.31.22; Tue, 11 Aug 2020 09:31:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729219AbgHKQaq (ORCPT + 99 others); Tue, 11 Aug 2020 12:30:46 -0400 Received: from mga14.intel.com ([192.55.52.115]:61573 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729200AbgHKQap (ORCPT ); Tue, 11 Aug 2020 12:30:45 -0400 IronPort-SDR: t2IhDhDhXcIAUkHjHJcwIFJ4yNE/Cgj4s9PnwMpIj9dStWr5pJkzGqokNvIBrKHtIODDZ2/G4P AsxzSjiYO1VA== X-IronPort-AV: E=McAfee;i="6000,8403,9710"; a="152985370" X-IronPort-AV: E=Sophos;i="5.76,301,1592895600"; d="scan'208";a="152985370" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2020 09:30:41 -0700 IronPort-SDR: HU6V+XSMI58jopp77XmX8puyGs5yxOoKqCfxto2bCYMPmA6v4MsWfYaqGIrqAmo0fL5Nd4zsNB 8RhjYjNYJ0iw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,301,1592895600"; d="scan'208";a="317786446" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by fmsmga004.fm.intel.com with ESMTP; 11 Aug 2020 09:30:41 -0700 From: Gage Eads To: linux-kernel@vger.kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org Cc: magnus.karlsson@intel.com, bjorn.topel@intel.com Subject: [PATCH v2 10/19] dlb2: add start domain ioctl Date: Tue, 11 Aug 2020 11:27:23 -0500 Message-Id: <20200811162732.1369-11-gage.eads@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20200811162732.1369-1-gage.eads@intel.com> References: <20200811162732.1369-1-gage.eads@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once a scheduling domain and its resources have been configured, the start domain ioctl is called to enable its ports to begin enqueueing to the device. Once started, the domain's resources cannot be configured again until after the domain is reset. Signed-off-by: Gage Eads Reviewed-by: Björn Töpel --- drivers/misc/dlb2/dlb2_ioctl.c | 3 + drivers/misc/dlb2/dlb2_main.h | 4 ++ drivers/misc/dlb2/dlb2_pf_ops.c | 10 ++++ drivers/misc/dlb2/dlb2_resource.c | 120 ++++++++++++++++++++++++++++++++++++++ drivers/misc/dlb2/dlb2_resource.h | 30 ++++++++++ include/uapi/linux/dlb2_user.h | 22 +++++++ 6 files changed, 189 insertions(+) diff --git a/drivers/misc/dlb2/dlb2_ioctl.c b/drivers/misc/dlb2/dlb2_ioctl.c index 68db45842e34..5b6d3b4c3297 100644 --- a/drivers/misc/dlb2/dlb2_ioctl.c +++ b/drivers/misc/dlb2/dlb2_ioctl.c @@ -51,6 +51,7 @@ DLB2_DOMAIN_IOCTL_CALLBACK_TEMPLATE(create_ldb_queue) DLB2_DOMAIN_IOCTL_CALLBACK_TEMPLATE(create_dir_queue) DLB2_DOMAIN_IOCTL_CALLBACK_TEMPLATE(get_ldb_queue_depth) DLB2_DOMAIN_IOCTL_CALLBACK_TEMPLATE(get_dir_queue_depth) +DLB2_DOMAIN_IOCTL_CALLBACK_TEMPLATE(start_domain) /* * Port creation ioctls don't use the callback template macro because they have @@ -343,6 +344,8 @@ long dlb2_domain_ioctl(struct file *f, unsigned int cmd, unsigned long arg) return dlb2_domain_ioctl_get_dir_port_pp_fd(dev, dom, arg); case DLB2_IOC_GET_DIR_PORT_CQ_FD: return dlb2_domain_ioctl_get_dir_port_cq_fd(dev, dom, arg); + case DLB2_IOC_START_DOMAIN: + return dlb2_domain_ioctl_start_domain(dev, dom, arg); default: return -ENOTTY; } diff --git a/drivers/misc/dlb2/dlb2_main.h b/drivers/misc/dlb2/dlb2_main.h index 06b9130643cb..abe9808b4638 100644 --- a/drivers/misc/dlb2/dlb2_main.h +++ b/drivers/misc/dlb2/dlb2_main.h @@ -78,6 +78,10 @@ struct dlb2_device_ops { struct dlb2_create_dir_port_args *args, uintptr_t cq_dma_base, struct dlb2_cmd_response *resp); + int (*start_domain)(struct dlb2_hw *hw, + u32 domain_id, + struct dlb2_start_domain_args *args, + struct dlb2_cmd_response *resp); int (*get_num_resources)(struct dlb2_hw *hw, struct dlb2_get_num_resources_args *args); int (*reset_domain)(struct dlb2_hw *hw, u32 domain_id); diff --git a/drivers/misc/dlb2/dlb2_pf_ops.c b/drivers/misc/dlb2/dlb2_pf_ops.c index 1e2e89d6945e..4ab4d9fe3f61 100644 --- a/drivers/misc/dlb2/dlb2_pf_ops.c +++ b/drivers/misc/dlb2/dlb2_pf_ops.c @@ -263,6 +263,15 @@ dlb2_pf_create_dir_port(struct dlb2_hw *hw, } static int +dlb2_pf_start_domain(struct dlb2_hw *hw, + u32 id, + struct dlb2_start_domain_args *args, + struct dlb2_cmd_response *resp) +{ + return dlb2_hw_start_domain(hw, id, args, resp, false, 0); +} + +static int dlb2_pf_get_num_resources(struct dlb2_hw *hw, struct dlb2_get_num_resources_args *args) { @@ -349,6 +358,7 @@ struct dlb2_device_ops dlb2_pf_ops = { .create_dir_queue = dlb2_pf_create_dir_queue, .create_ldb_port = dlb2_pf_create_ldb_port, .create_dir_port = dlb2_pf_create_dir_port, + .start_domain = dlb2_pf_start_domain, .get_num_resources = dlb2_pf_get_num_resources, .reset_domain = dlb2_pf_reset_domain, .ldb_port_owned_by_domain = dlb2_pf_ldb_port_owned_by_domain, diff --git a/drivers/misc/dlb2/dlb2_resource.c b/drivers/misc/dlb2/dlb2_resource.c index 454a1aacfaf2..4d8b56a4b437 100644 --- a/drivers/misc/dlb2/dlb2_resource.c +++ b/drivers/misc/dlb2/dlb2_resource.c @@ -1303,6 +1303,34 @@ dlb2_verify_create_dir_port_args(struct dlb2_hw *hw, return 0; } +static int dlb2_verify_start_domain_args(struct dlb2_hw *hw, + u32 domain_id, + struct dlb2_cmd_response *resp, + bool vdev_req, + unsigned int vdev_id) +{ + struct dlb2_hw_domain *domain; + + domain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id); + + if (!domain) { + resp->status = DLB2_ST_INVALID_DOMAIN_ID; + return -EINVAL; + } + + if (!domain->configured) { + resp->status = DLB2_ST_DOMAIN_NOT_CONFIGURED; + return -EINVAL; + } + + if (domain->started) { + resp->status = DLB2_ST_DOMAIN_STARTED; + return -EINVAL; + } + + return 0; +} + static bool dlb2_port_find_slot(struct dlb2_ldb_port *port, enum dlb2_qid_map_state state, int *slot) @@ -3259,6 +3287,98 @@ int dlb2_hw_create_dir_port(struct dlb2_hw *hw, return 0; } +static void dlb2_log_start_domain(struct dlb2_hw *hw, + u32 domain_id, + bool vdev_req, + unsigned int vdev_id) +{ + DLB2_HW_DBG(hw, "DLB2 start domain arguments:\n"); + if (vdev_req) + DLB2_HW_DBG(hw, "(Request from vdev %d)\n", vdev_id); + DLB2_HW_DBG(hw, "\tDomain ID: %d\n", domain_id); +} + +/** + * dlb2_hw_start_domain() - Lock the domain configuration + * @hw: Contains the current state of the DLB2 hardware. + * @domain_id: Domain ID + * @arg: User-provided arguments (unused, here for ioctl callback template). + * @resp: Response to user. + * @vdev_req: Request came from a virtual device. + * @vdev_id: If vdev_req is true, this contains the virtual device's ID. + * + * Return: returns < 0 on error, 0 otherwise. If the driver is unable to + * satisfy a request, resp->status will be set accordingly. + */ +int +dlb2_hw_start_domain(struct dlb2_hw *hw, + u32 domain_id, + __attribute((unused)) struct dlb2_start_domain_args *arg, + struct dlb2_cmd_response *resp, + bool vdev_req, + unsigned int vdev_id) +{ + struct dlb2_dir_pq_pair *dir_queue; + struct dlb2_ldb_queue *ldb_queue; + struct dlb2_hw_domain *domain; + int ret; + + dlb2_log_start_domain(hw, domain_id, vdev_req, vdev_id); + + ret = dlb2_verify_start_domain_args(hw, + domain_id, + resp, + vdev_req, + vdev_id); + if (ret) + return ret; + + domain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id); + if (!domain) { + DLB2_HW_ERR(hw, + "[%s():%d] Internal error: domain not found\n", + __func__, __LINE__); + return -EFAULT; + } + + /* + * Enable load-balanced and directed queue write permissions for the + * queues this domain owns. Without this, the DLB2 will drop all + * incoming traffic to those queues. + */ + DLB2_DOM_LIST_FOR(domain->used_ldb_queues, ldb_queue) { + union dlb2_sys_ldb_vasqid_v r0 = { {0} }; + unsigned int offs; + + r0.field.vasqid_v = 1; + + offs = domain->id.phys_id * DLB2_MAX_NUM_LDB_QUEUES + + ldb_queue->id.phys_id; + + DLB2_CSR_WR(hw, DLB2_SYS_LDB_VASQID_V(offs), r0.val); + } + + DLB2_DOM_LIST_FOR(domain->used_dir_pq_pairs, dir_queue) { + union dlb2_sys_dir_vasqid_v r0 = { {0} }; + unsigned int offs; + + r0.field.vasqid_v = 1; + + offs = domain->id.phys_id * DLB2_MAX_NUM_DIR_PORTS + + dir_queue->id.phys_id; + + DLB2_CSR_WR(hw, DLB2_SYS_DIR_VASQID_V(offs), r0.val); + } + + dlb2_flush_csr(hw); + + domain->started = true; + + resp->status = 0; + + return 0; +} + static void dlb2_domain_finish_unmap_port_slot(struct dlb2_hw *hw, struct dlb2_hw_domain *domain, diff --git a/drivers/misc/dlb2/dlb2_resource.h b/drivers/misc/dlb2/dlb2_resource.h index ffdc35ebbc1e..d5b554b701f5 100644 --- a/drivers/misc/dlb2/dlb2_resource.h +++ b/drivers/misc/dlb2/dlb2_resource.h @@ -209,6 +209,36 @@ int dlb2_hw_create_ldb_port(struct dlb2_hw *hw, unsigned int vdev_id); /** + * dlb2_hw_start_domain() - start a scheduling domain + * @hw: dlb2_hw handle for a particular device. + * @domain_id: domain ID. + * @args: start domain arguments. + * @resp: response structure. + * @vdev_request: indicates whether this request came from a vdev. + * @vdev_id: If vdev_request is true, this contains the vdev's ID. + * + * This function starts a scheduling domain, which allows applications to send + * traffic through it. Once a domain is started, its resources can no longer be + * configured (besides QID remapping and port enable/disable). + * + * A vdev can be either an SR-IOV virtual function or a Scalable IOV virtual + * device. + * + * Return: + * Returns 0 upon success, < 0 otherwise. If an error occurs, resp->status is + * assigned a detailed error code from enum dlb2_error. + * + * Errors: + * EINVAL - the domain is not configured, or the domain is already started. + */ +int dlb2_hw_start_domain(struct dlb2_hw *hw, + u32 domain_id, + struct dlb2_start_domain_args *args, + struct dlb2_cmd_response *resp, + bool vdev_request, + unsigned int vdev_id); + +/** * dlb2_reset_domain() - reset a scheduling domain * @hw: dlb2_hw handle for a particular device. * @domain_id: domain ID. diff --git a/include/uapi/linux/dlb2_user.h b/include/uapi/linux/dlb2_user.h index 898ff4df3462..0eb9e14de11d 100644 --- a/include/uapi/linux/dlb2_user.h +++ b/include/uapi/linux/dlb2_user.h @@ -456,6 +456,23 @@ struct dlb2_get_port_fd_args { __u32 padding0; }; +/* + * DLB2_DOMAIN_CMD_START_DOMAIN: Mark the end of the domain configuration. This + * must be called before passing QEs into the device, and no configuration + * ioctls can be issued once the domain has started. Sending QEs into the + * device before calling this ioctl will result in undefined behavior. + * Input parameters: + * - (None) + * + * Output parameters: + * - response.status: Detailed error code. In certain cases, such as if the + * ioctl request arg is invalid, the driver won't set status. + */ +struct dlb2_start_domain_args { + /* Output parameters */ + struct dlb2_cmd_response response; +}; + enum dlb2_domain_user_interface_commands { DLB2_DOMAIN_CMD_CREATE_LDB_QUEUE, DLB2_DOMAIN_CMD_CREATE_DIR_QUEUE, @@ -467,6 +484,7 @@ enum dlb2_domain_user_interface_commands { DLB2_DOMAIN_CMD_GET_LDB_PORT_CQ_FD, DLB2_DOMAIN_CMD_GET_DIR_PORT_PP_FD, DLB2_DOMAIN_CMD_GET_DIR_PORT_CQ_FD, + DLB2_DOMAIN_CMD_START_DOMAIN, /* NUM_DLB2_DOMAIN_CMD must be last */ NUM_DLB2_DOMAIN_CMD, @@ -541,5 +559,9 @@ enum dlb2_domain_user_interface_commands { _IOWR(DLB2_IOC_MAGIC, \ DLB2_DOMAIN_CMD_GET_DIR_PORT_CQ_FD, \ struct dlb2_get_port_fd_args) +#define DLB2_IOC_START_DOMAIN \ + _IOR(DLB2_IOC_MAGIC, \ + DLB2_DOMAIN_CMD_START_DOMAIN, \ + struct dlb2_start_domain_args) #endif /* __DLB2_USER_H */ -- 2.13.6