From patchwork Thu Jan 24 15:24:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 156482 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2087522jaa; Thu, 24 Jan 2019 07:26:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN6hXjmlwp+GZE0BK0q8s6RMsQ4hEcL+YkGFBB+5zG365UaV5uXslxMC9nBiCvnG8zLcKvTH X-Received: by 2002:a17:902:b093:: with SMTP id p19mr6947843plr.135.1548343565252; Thu, 24 Jan 2019 07:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548343565; cv=none; d=google.com; s=arc-20160816; b=OCOcPKpEKdwssbwFPaHq0cgoutL1lpz8SfY6XmPYTpFIUfyarNpWwSt2MFDzdzVcx+ rh8zJFc2Xhv2GjLeCHqEYFSGtwnEFvvl1xmTtifehgsxznQe+q8t3vjBm65ss3otZLi5 0MCF4e+aygMufprS+vABhjOtN6pjC8ghmvJn+lCxwDLz7geVSF1BdlohSv/sWYSxA9EL 3WEsL+C7sV5Mx8/LBT2FVayUCHWaH8sveIOiX0mgQOGeCjXEQN/BvCl/GeigUlzRC/yn KO+NY9sRtXMvW9vTau98uJoIg9OUgsJIaYLYn7Pp55mRh71RNLj2NPG8Gw4pQ7Ydjtjl mKmg== 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 :dkim-signature; bh=IaYS66AUeg4SgQnQt8AHydiuWOzD4Ix0QSds3elRmYM=; b=WUgvATMzxhfo1dJAXAj/GRLtV+KVA5thzVcYVI4CTP7NhxO2opMfSW5H6dfvVfJ1Vj KOZcSnKWVYzdlxnBEyWAqPZoMy+qqOsEHXe3EXN1FL0DVGp02g4Q85ritJCgKNQF4aZh tkCEfuj87QlasPf1lf9ET8aMFWoH/JEiq0tuAZ2m8SEmRn+ISQv1B+UJqo4CCRk19haZ zRbY18SXGoYWP0FxwK7W4iSAceixY27QdYY6LdT6l4V4GzFbUebrvjH66B15uU/RmOcG KGn7PbFdQ/GzTDBOJLkojx87PsUpvLBjm2c30Yx2UNWHh5kyErTGlx6u04CjCqMjKL30 TPoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=evbWPKAw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k11si23406780pgg.430.2019.01.24.07.26.04; Thu, 24 Jan 2019 07:26:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=evbWPKAw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728713AbfAXP0A (ORCPT + 31 others); Thu, 24 Jan 2019 10:26:00 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37628 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728668AbfAXPZ4 (ORCPT ); Thu, 24 Jan 2019 10:25:56 -0500 Received: by mail-wm1-f67.google.com with SMTP id g67so3478070wmd.2 for ; Thu, 24 Jan 2019 07:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IaYS66AUeg4SgQnQt8AHydiuWOzD4Ix0QSds3elRmYM=; b=evbWPKAwss9Fp9zia17gFFi7ygNfIgA0vdxwtf5nRmh00Kb4rOWD9vMI2ZRD8kRZ3Q MI2n6HErZsKmNhqcvU+V/rDUsAsXOxy7J29DEDiMpzRA7BeRPg/6rgvq1VeiM5v7+FO/ u25GRcu26AEW6SjCDcgV31th2K8bnFt0fZtrg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IaYS66AUeg4SgQnQt8AHydiuWOzD4Ix0QSds3elRmYM=; b=Fnf8pWyzZs4n2RX6He9ELKSvWQKNPXU75o2NtAfBTrxhHTxJb6Tb0xwMbqU9y66NtE ag3oEvWy3i68LF5m7N6jiPSpMY72MVeZz+xdLdRSu4GZuH7WNrVMXBU+IeOh6chkY35o Itqy7N37BsAOoQlvR9zFvVqtS7SCxM/eeJhVoorSrmto4DsEggkYwSMqzxqEUbbxluzv oHzi9PGVzYJiU1gAcz2/yPRUsGTeuEwq2crFuqacVypnhZ7YTUdKw3qROiy3BkUFdcTF k+Vf9/9qIaGPHLKLCmbPdYfLViETXLfwOtjB70KMOTfb5zVeQ9kPByUPeVET26jf6xkU 402g== X-Gm-Message-State: AJcUukd/vJlFjHORlym12F7Fo+uLn+mnzzoV0/n03xLI+Lo8kQXdOxSR uGkoigvlTYgMKLPyhrYy0HAvMA== X-Received: by 2002:a7b:c2a9:: with SMTP id c9mr3306447wmk.44.1548343553142; Thu, 24 Jan 2019 07:25:53 -0800 (PST) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id z12sm80371157wrh.35.2019.01.24.07.25.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 07:25:52 -0800 (PST) From: Srinivas Kandagatla To: robh+dt@kernel.org, gregkh@linuxfoundation.org, arnd@arndb.de Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org, bkumar@qti.qualcomm.com, linux-arm-msm@vger.kernel.org, thierry.escande@linaro.org, Srinivas Kandagatla Subject: [PATCH v4 4/5] misc: fastrpc: Add support for create remote init process Date: Thu, 24 Jan 2019 15:24:11 +0000 Message-Id: <20190124152412.10503-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124152412.10503-1-srinivas.kandagatla@linaro.org> References: <20190124152412.10503-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds support to create or attach remote shell process. The shell process called fastrpc_shell_0 is usually loaded on the DSP when a user process is spawned. Most of the work is derived from various downstream Qualcomm kernels. Credits to various Qualcomm authors who have contributed to this code. Specially Tharun Kumar Merugu Co-developed-by: Thierry Escande Signed-off-by: Thierry Escande Signed-off-by: Srinivas Kandagatla --- drivers/misc/fastrpc.c | 141 +++++++++++++++++++++++++++++++++++- include/uapi/misc/fastrpc.h | 10 +++ 2 files changed, 150 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 86adaad90a0c..b9972f1be9f4 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -29,7 +29,10 @@ #define FASTRPC_MAX_CRCLIST 64 #define FASTRPC_PHYS(p) ((p) & 0xffffffff) #define FASTRPC_CTX_MAX (256) +#define FASTRPC_INIT_HANDLE 1 #define FASTRPC_CTXID_MASK (0xFF0) +#define INIT_FILELEN_MAX (2 * 1024 * 1024) +#define INIT_MEMLEN_MAX (8 * 1024 * 1024) #define FASTRPC_DEVICE_NAME "fastrpc" /* Retrives number of input buffers from the scalars parameter */ @@ -60,6 +63,13 @@ #define FASTRPC_SCALARS(method, in, out) \ FASTRPC_BUILD_SCALARS(0, method, in, out, 0, 0) +/* Remote Method id table */ +#define FASTRPC_RMID_INIT_ATTACH 0 +#define FASTRPC_RMID_INIT_RELEASE 1 +#define FASTRPC_RMID_INIT_CREATE 6 +#define FASTRPC_RMID_INIT_CREATE_ATTR 7 +#define FASTRPC_RMID_INIT_CREATE_STATIC 8 + #define miscdev_to_cctx(d) container_of(d, struct fastrpc_channel_ctx, miscdev) static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", @@ -666,7 +676,96 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel, fastrpc_context_free(ctx); if (err) - dev_err(fl->sctx->dev, "Error: Invoke Failed %d\n", err); + dev_dbg(fl->sctx->dev, "Error: Invoke Failed %d\n", err); + + return err; +} + +static int fastrpc_init_create_process(struct fastrpc_user *fl, + char __user *argp) +{ + struct fastrpc_init_create init; + struct fastrpc_invoke_args args[6]; + struct fastrpc_phy_page pages[1]; + struct fastrpc_map *map = NULL; + struct fastrpc_buf *imem = NULL; + int memlen; + int err; + struct { + int pgid; + u32 namelen; + u32 filelen; + u32 pageslen; + u32 attrs; + u32 siglen; + } inbuf; + u32 sc; + + if (copy_from_user(&init, argp, sizeof(init))) + return -EFAULT; + + if (init.filelen > INIT_FILELEN_MAX) + return -EINVAL; + + inbuf.pgid = fl->tgid; + inbuf.namelen = strlen(current->comm) + 1; + inbuf.filelen = init.filelen; + inbuf.pageslen = 1; + inbuf.attrs = init.attrs; + inbuf.siglen = init.siglen; + fl->pd = 1; + + if (init.filelen && init.filefd) { + err = fastrpc_map_create(fl, init.filefd, init.filelen, &map); + if (err) + goto bail; + } + + memlen = ALIGN(max(INIT_FILELEN_MAX, (int)init.filelen * 4), + 1024 * 1024); + err = fastrpc_buf_alloc(fl, fl->sctx->dev, memlen, + &imem); + if (err) + goto bail; + + fl->init_mem = imem; + args[0].ptr = (u64)(uintptr_t)&inbuf; + args[0].length = sizeof(inbuf); + args[0].fd = -1; + + args[1].ptr = (u64)(uintptr_t)current->comm; + args[1].length = inbuf.namelen; + args[1].fd = -1; + + args[2].ptr = (u64) init.file; + args[2].length = inbuf.filelen; + args[2].fd = init.filefd; + + pages[0].addr = imem->phys; + pages[0].size = imem->size; + + args[3].ptr = (u64)(uintptr_t) pages; + args[3].length = 1 * sizeof(*pages); + args[3].fd = -1; + + args[4].ptr = (u64)(uintptr_t)&inbuf.attrs; + args[4].length = sizeof(inbuf.attrs); + args[4].fd = -1; + + args[5].ptr = (u64)(uintptr_t) &inbuf.siglen; + args[5].length = sizeof(inbuf.siglen); + args[5].fd = -1; + + sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_CREATE, 4, 0); + if (init.attrs) + sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_CREATE_ATTR, 6, 0); + + err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, + sc, &args[0]); + +bail: + if (map) + fastrpc_map_put(map); return err; } @@ -698,6 +797,22 @@ static void fastrpc_session_free(struct fastrpc_channel_ctx *cctx, spin_unlock(&cctx->lock); } +static int fastrpc_release_current_dsp_process(struct fastrpc_user *fl) +{ + struct fastrpc_invoke_args args[1]; + int tgid = 0; + u32 sc; + + tgid = fl->tgid; + args[0].ptr = (u64)(uintptr_t) &tgid; + args[0].length = sizeof(tgid); + args[0].fd = -1; + sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_RELEASE, 1, 0); + + return fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, + sc, &args[0]); +} + static int fastrpc_device_release(struct inode *inode, struct file *file) { struct fastrpc_user *fl = (struct fastrpc_user *)file->private_data; @@ -705,6 +820,8 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) struct fastrpc_invoke_ctx *ctx, *n; struct fastrpc_map *map, *m; + fastrpc_release_current_dsp_process(fl); + spin_lock(&cctx->lock); list_del(&fl->user); spin_unlock(&cctx->lock); @@ -752,6 +869,22 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) return 0; } +static int fastrpc_init_attach(struct fastrpc_user *fl) +{ + struct fastrpc_invoke_args args[1]; + int tgid = fl->tgid; + u32 sc; + + args[0].ptr = (u64)(uintptr_t) &tgid; + args[0].length = sizeof(tgid); + args[0].fd = -1; + sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_ATTACH, 1, 0); + fl->pd = 0; + + return fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, + sc, &args[0]); +} + static int fastrpc_invoke(struct fastrpc_user *fl, char __user *argp) { struct fastrpc_invoke_args *args = NULL; @@ -792,6 +925,12 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int cmd, case FASTRPC_IOCTL_INVOKE: err = fastrpc_invoke(fl, argp); break; + case FASTRPC_IOCTL_INIT_ATTACH: + err = fastrpc_init_attach(fl); + break; + case FASTRPC_IOCTL_INIT_CREATE: + err = fastrpc_init_create_process(fl, argp); + break; default: err = -ENOTTY; dev_err(fl->sctx->dev, "bad ioctl: %d\n", cmd); diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h index a69ef33dc37e..32d191c3b7bc 100644 --- a/include/uapi/misc/fastrpc.h +++ b/include/uapi/misc/fastrpc.h @@ -6,6 +6,8 @@ #include #define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke) +#define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4) +#define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create) struct fastrpc_invoke_args { __u64 ptr; @@ -20,4 +22,12 @@ struct fastrpc_invoke { __u64 args; }; +struct fastrpc_init_create { + __u32 filelen; /* elf file length */ + __s32 filefd; /* fd for the file */ + __u32 attrs; + __u32 siglen; + __u64 file; /* pointer to elf file */ +}; + #endif /* __QCOM_FASTRPC_H__ */