From nobody Sun May 19 07:16:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714121275; cv=none; d=zohomail.com; s=zohoarc; b=SDgOcpEQx1TlFyrAJPPdu/lAafkMeEIPmgshoTSoggjM8ANKwLq/gs1K4UzEWqrHzq+ZEjQXdcIfd1JNnNRYWVkQgbt4EJg/3BqzA1vzy7OOtdxPFurbw0R9mVr3WQ+4LKfU3D/b2xyzST/WOoF0hUZeIO6eQ+7ZoFphiqz1k7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714121275; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2VzeWK8x82YxZO3FACx+2RlqRVfXhRtSExk4PP34ai4=; b=L8kYF2DGjI6YafESGmqUmaN2fs4sXfTVbGW7ItR8BXDkFMeXWl/mcNblCiwJCjtU+uo46oZziVrGAPIbXsvVrAmwNtb1Eq5RNW7PQlvCXJ/CyDfPBzOgAQ73LcYyh8XwQT0cPrxYoyVlfywOgWmsXkDX/JrjgIaXmntetPbLQPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714121275214539.3726166108838; Fri, 26 Apr 2024 01:47:55 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712547.1113292 (Exim 4.92) (envelope-from ) id 1s0HEy-0007hp-JC; Fri, 26 Apr 2024 08:47:32 +0000 Received: by outflank-mailman (output) from mailman id 712547.1113292; Fri, 26 Apr 2024 08:47:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEy-0007hi-FC; Fri, 26 Apr 2024 08:47:32 +0000 Received: by outflank-mailman (input) for mailman id 712547; Fri, 26 Apr 2024 08:47:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEw-0007TR-MC for xen-devel@lists.xenproject.org; Fri, 26 Apr 2024 08:47:30 +0000 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [2a00:1450:4864:20::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9cc1fc72-03a9-11ef-b4bb-af5377834399; Fri, 26 Apr 2024 10:47:28 +0200 (CEST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a58bd410f92so187630466b.0 for ; Fri, 26 Apr 2024 01:47:28 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id qu20-20020a170907111400b00a5242ec4573sm10339211ejb.29.2024.04.26.01.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 01:47:26 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9cc1fc72-03a9-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714121248; x=1714726048; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2VzeWK8x82YxZO3FACx+2RlqRVfXhRtSExk4PP34ai4=; b=xBaP9ugoBJJ3oTd7AjJa1nh9fLn25gDjjf1nUCEOk/t3oKhJRbrG6fr/6bMx5nFmUf Qc5oj3cNt4pOIfouUc1vZn5+oTZqx79ZZ0D3IDVfOfaUputUf3YYN1ko3CwUjRU4/vli XTbw+1G9qOOVBUAgkPbQtBYvPuVrTKwfbNW3FyO8WA9hsYEX8ed5xLs5P5UW9lRs0k/o 7F8ieD7t5N3++E1RFQxpa33m8pI1q46Mv14Pn1ZrZBrZVjsbm8Zp12wv8Su2BaG15gbM fAjWLYI0gPSeRZtCuf2zZZtXp0ceDsaiYf2iKbNrT8sNRKbYf9VEk4ojJTGTuW1CH3y2 A5WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714121248; x=1714726048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2VzeWK8x82YxZO3FACx+2RlqRVfXhRtSExk4PP34ai4=; b=xBQjHC1V/uy88uxThh+hqpJGguwTIkA2FgwA4u1JFOmjyS4oVx2wxcDCaG0pGJs4Qf JSz1WH5Wid4BywBkRmcdvkRaCVVyoRcwhl3K9FOHAl5M8g0zcyJQr8M1rA+REt/KhHuH fX+8ffLXqRKk2BSHBJOALXDYxPSON0CMSi0zld4LOnE1OmgbdrYj0CIxtkhw7x5ftLii xxiB4B8+Va3A7cesfWapEp//Ipt0cis1yEPcd1LFmT2djbjOjM0Z0tyrFD2ZXUQXMedU uEZuHB4TOrAQPcru/KnbRF0hFHQqWXtlmiKkhV1HEWxGJ2hmBO6QCAUSp2po5wgVbniL v0vA== X-Gm-Message-State: AOJu0YwzNxJyVU8zom54jLBdmTUkJV4fSwfsiKIBmUdM1qCz8ytTb/Gx er2plsJi7PU0s6ucyYVd4ZLCy3MW3umKizFtfbJYhsaQ6AsIuVZA8fjK3MtAeDc5V0r70ax7S5s W X-Google-Smtp-Source: AGHT+IFIzpbDKDHkTqWP5z+4E+TTctdEfjpzFk6DYoH3Ue/Lrzh8H8wxajoKbis4dtVxr/Kf5ulalQ== X-Received: by 2002:a17:907:7890:b0:a55:b345:63ec with SMTP id ku16-20020a170907789000b00a55b34563ecmr1324188ejc.15.1714121247785; Fri, 26 Apr 2024 01:47:27 -0700 (PDT) From: Jens Wiklander To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, Jens Wiklander , Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel Subject: [XEN PATCH v3 1/5] xen/arm: ffa: refactor ffa_handle_call() Date: Fri, 26 Apr 2024 10:47:19 +0200 Message-Id: <20240426084723.4149648-2-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240426084723.4149648-1-jens.wiklander@linaro.org> References: <20240426084723.4149648-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714121276955100007 Content-Type: text/plain; charset="utf-8" Refactors the large switch block in ffa_handle_call() to use common code for the simple case where it's either an error code or success with no further parameters. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 8665201e34a9..5209612963e1 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -273,18 +273,10 @@ static bool ffa_handle_call(struct cpu_user_regs *reg= s) case FFA_RXTX_MAP_64: e =3D ffa_handle_rxtx_map(fid, get_user_reg(regs, 1), get_user_reg(regs, 2), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_RXTX_UNMAP: e =3D ffa_handle_rxtx_unmap(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_PARTITION_INFO_GET: e =3D ffa_handle_partition_info_get(get_user_reg(regs, 1), get_user_reg(regs, 2), @@ -299,11 +291,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) return true; case FFA_RX_RELEASE: e =3D ffa_handle_rx_release(); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; case FFA_MSG_SEND_DIRECT_REQ_32: case FFA_MSG_SEND_DIRECT_REQ_64: handle_msg_send_direct_req(regs, fid); @@ -316,17 +304,19 @@ static bool ffa_handle_call(struct cpu_user_regs *reg= s) e =3D ffa_handle_mem_reclaim(regpair_to_uint64(get_user_reg(regs, = 2), get_user_reg(regs, 1)= ), get_user_reg(regs, 3)); - if ( e ) - ffa_set_regs_error(regs, e); - else - ffa_set_regs_success(regs, 0, 0); - return true; + break; =20 default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return true; } + + if ( e ) + ffa_set_regs_error(regs, e); + else + ffa_set_regs_success(regs, 0, 0); + return true; } =20 static int ffa_domain_init(struct domain *d) --=20 2.34.1 From nobody Sun May 19 07:16:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714121271; cv=none; d=zohomail.com; s=zohoarc; b=dBjaY1nMwCj9KORtZicswILVq+y2JNeRjtotXaddbaTQypNtPFRSNUCanc8cSNqNNLbSLnBvWgvNMFm5lrCFsIKUXGrA8ByKLhnKc+1SYdkcQ83IuBb8aNaYWvBZj41IrpoNEod3Z5XTjrq7IHJ9utTSZ9eMt550ejCd+uuWDRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714121271; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Injz1eHKMU34CsdRACoEV/3/mGn5muvQCz5MmACq6o4=; b=MiCP0vpYPWT0SMx2igsCzuxr8EEic/8gElIyke/J/enontnpwOxWYxPzd/hbJX/o5bh2cD23QJwE3Oa8ocdI/oNkwOCVuoHjUSaOomAeeXxoGhXbhOIYXzPm/niGWB9pxQgSfrmqA/31k613Of9cJbqeOeVlrapqYIxfETXfkFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 171412127111433.01595470837913; Fri, 26 Apr 2024 01:47:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712548.1113297 (Exim 4.92) (envelope-from ) id 1s0HEy-0007kU-Qo; Fri, 26 Apr 2024 08:47:32 +0000 Received: by outflank-mailman (output) from mailman id 712548.1113297; Fri, 26 Apr 2024 08:47:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEy-0007jG-M4; Fri, 26 Apr 2024 08:47:32 +0000 Received: by outflank-mailman (input) for mailman id 712548; Fri, 26 Apr 2024 08:47:30 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEw-0007Se-T4 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2024 08:47:30 +0000 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [2a00:1450:4864:20::12b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9dbd6b58-03a9-11ef-909a-e314d9c70b13; Fri, 26 Apr 2024 10:47:30 +0200 (CEST) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-51acb95b892so2376444e87.2 for ; Fri, 26 Apr 2024 01:47:30 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id qu20-20020a170907111400b00a5242ec4573sm10339211ejb.29.2024.04.26.01.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 01:47:28 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9dbd6b58-03a9-11ef-909a-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714121249; x=1714726049; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Injz1eHKMU34CsdRACoEV/3/mGn5muvQCz5MmACq6o4=; b=igM2VAkVPM4/6NANE7aZ6TLehdACnkARw0BHHcu5r8/Vq2AMXAT0KzH1zoE0/J7n2b PD1zGoV0JmgI4WAlgmImkkSNiAjKEbzPtV8qVPfJJfTNEWhD4+eJOEqyBeWxXP56GCpl 93V60eWZIR5YqEcp/km9v/hCWJDAzQTAXyUEW0Sex/5L52DDn8xYNTJFhlWsRQYg7L9B EInqFL0pQLmJ087REVBHlAiA9kadmo1g7Gwj2Wbk4nGMbDlt3ex0Pv40zXiX1egRPfbH ol0kj0kfQKMPjtoNWoMt8ktSKiWUi6mb4is/1W/4uNYMssiUUNMS/a50lGeD6ZmSaoHL OZXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714121249; x=1714726049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Injz1eHKMU34CsdRACoEV/3/mGn5muvQCz5MmACq6o4=; b=vsmyCI9nXrLUad2F19q9BwSX3D2OtwIhNeFvzUGKhuJspDe3tOJ9zU/ktUxjCVS41F ts+xcM6h+2qHZkiOGNMHZcPWO0zr/f3TX2p6vL+ojsuP1jjUhu1iADZLYa+m4m58f4QJ iV9ymGFD9Voss/ziq0e4wmQsSfbCluRwU98sNZRCFsZWqMpucMBix9fly2m2mQF/C4QA rJ+NhmbwZMr2RUgUqog1dgUcj6M/kfs92N+eVRjRqw4sZEHj2cm8OgYBtJVhriU8ioUf C7iZxMpG0hg00oXLy2+nDsB1+35On0GcsoJMdVifPQ1/Wt7hcqeAPMUQl5qnfbfiXJDK kteQ== X-Gm-Message-State: AOJu0YwudLsvTvq0yAcOUb1sQxue3zZrJhYpFE4nk6DbYDbqCRsJLwuJ KqPNr3/7RhYpX88iDaArPsECuU/aEm5yH0I4BFPJI3onWKjbRXI7u0bSvHj6X/55GTgB1w2GoBJ 8 X-Google-Smtp-Source: AGHT+IF12xWOO76mUX1Wf/VnAFoEUe7G4Wnd7/Djm+bzZ2IGef+t3GKceVxPeqA4MGRisIGUh5cv9w== X-Received: by 2002:a19:7412:0:b0:51b:ce76:7813 with SMTP id v18-20020a197412000000b0051bce767813mr1759542lfe.58.1714121249205; Fri, 26 Apr 2024 01:47:29 -0700 (PDT) From: Jens Wiklander To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, Jens Wiklander , Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel Subject: [XEN PATCH v3 2/5] xen/arm: ffa: use ACCESS_ONCE() Date: Fri, 26 Apr 2024 10:47:20 +0200 Message-Id: <20240426084723.4149648-3-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240426084723.4149648-1-jens.wiklander@linaro.org> References: <20240426084723.4149648-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714121272956100003 Content-Type: text/plain; charset="utf-8" Replace read_atomic() with ACCESS_ONCE() to match the intended use, that is, to prevent the compiler from (via optimization) reading shared memory more than once. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa_shm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index eed9ad2d2986..75a5b66aeb4c 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include =20 @@ -171,8 +172,8 @@ static int get_shm_pages(struct domain *d, struct ffa_s= hm_mem *shm, =20 for ( n =3D 0; n < range_count; n++ ) { - page_count =3D read_atomic(&range[n].page_count); - addr =3D read_atomic(&range[n].address); + page_count =3D ACCESS_ONCE(range[n].page_count); + addr =3D ACCESS_ONCE(range[n].address); for ( m =3D 0; m < page_count; m++ ) { if ( pg_idx >=3D shm->page_count ) @@ -527,13 +528,13 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; =20 mem_access =3D ctx->tx + trans.mem_access_offs; - if ( read_atomic(&mem_access->access_perm.perm) !=3D FFA_MEM_ACC_RW ) + if ( ACCESS_ONCE(mem_access->access_perm.perm) !=3D FFA_MEM_ACC_RW ) { ret =3D FFA_RET_NOT_SUPPORTED; goto out_unlock; } =20 - region_offs =3D read_atomic(&mem_access->region_offs); + region_offs =3D ACCESS_ONCE(mem_access->region_offs); if ( sizeof(*region_descr) + region_offs > frag_len ) { ret =3D FFA_RET_NOT_SUPPORTED; @@ -541,8 +542,8 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) } =20 region_descr =3D ctx->tx + region_offs; - range_count =3D read_atomic(®ion_descr->address_range_count); - page_count =3D read_atomic(®ion_descr->total_page_count); + range_count =3D ACCESS_ONCE(region_descr->address_range_count); + page_count =3D ACCESS_ONCE(region_descr->total_page_count); =20 if ( !page_count ) { @@ -557,7 +558,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out_unlock; } shm->sender_id =3D trans.sender_id; - shm->ep_id =3D read_atomic(&mem_access->access_perm.endpoint_id); + shm->ep_id =3D ACCESS_ONCE(mem_access->access_perm.endpoint_id); =20 /* * Check that the Composite memory region descriptor fits. --=20 2.34.1 From nobody Sun May 19 07:16:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714121273; cv=none; d=zohomail.com; s=zohoarc; b=k1OO+mYQDh7IJdFPUtC5p7VrlFfQw4BfhRE90XgTQkGk9yU5JJsR2OG4tvyv6nXBIh+EkJnsuXwuEV0X669ZbSoq4pVSGeUWrw8WZd1mI8bpmnLUl2E7oKYSyn5VGtGqqNG0ZUGX5pFizUYHElI5OFGWEia7tjukQNvWYN0TINg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714121273; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XH0hx5FhOx9XD5Quim9d/dWx8ptFKhc8V8iHDPJ7zTg=; b=gPf1KBdVme6vrH4fA6ertMxSqTlEuAjNEqcItH93NzWO/yeGsWx2RT1auf+maRARLxEcOo7iAN0ZkNfyGGwCe7+lkF/SlDwen7zOTEdiP/V8tR4Uq//ktY5UVc7fj2uMQEERlkBPkuN/F2cX5ZQ362kwYe3f0HCTwFniqi5tsjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714121273301852.007980716671; Fri, 26 Apr 2024 01:47:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712549.1113306 (Exim 4.92) (envelope-from ) id 1s0HEz-0007vX-Bj; Fri, 26 Apr 2024 08:47:33 +0000 Received: by outflank-mailman (output) from mailman id 712549.1113306; Fri, 26 Apr 2024 08:47:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEz-0007sw-3c; Fri, 26 Apr 2024 08:47:33 +0000 Received: by outflank-mailman (input) for mailman id 712549; Fri, 26 Apr 2024 08:47:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HEy-0007Se-7m for xen-devel@lists.xenproject.org; Fri, 26 Apr 2024 08:47:32 +0000 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [2a00:1450:4864:20::22e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9e941b30-03a9-11ef-909a-e314d9c70b13; Fri, 26 Apr 2024 10:47:31 +0200 (CEST) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2dd6a7ae2dcso28622501fa.1 for ; Fri, 26 Apr 2024 01:47:31 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id qu20-20020a170907111400b00a5242ec4573sm10339211ejb.29.2024.04.26.01.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 01:47:30 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9e941b30-03a9-11ef-909a-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714121250; x=1714726050; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XH0hx5FhOx9XD5Quim9d/dWx8ptFKhc8V8iHDPJ7zTg=; b=xzwqqh7qJSL3GCd03CS3YDPhxH0b5JoVRzM4NKOjGKz5UqdKuS1ZHCnqibB1s1Nrr7 IBWcNPkcfs5sPGJZQcUBQqvFUxGUv+YhWUsOZwudTWVEfgh6jIDrPb3dyRu2WvWK0Xdm c3dx1FcSgFpmA117+/InSBrayvlrrenm/zI4QpsmS2xDv0uLt/lqpwQck7gjtjj9WCdR Q77LBB1hDvOWhgUUCGWiavIW7UcZkYAuYKta6MiRNPBgg3SeUYzLXhP5cNuvjA2VJu0O N970ICXyozjIo1aKSBY6fA9HucBn8+xFfMvnlu9KYhg1q3ZMSvQXvu8zUNUShx3FYMDI e4kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714121251; x=1714726051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XH0hx5FhOx9XD5Quim9d/dWx8ptFKhc8V8iHDPJ7zTg=; b=V9wB5isQnHmmcdGQ78JEpC4nR0pYjJ9Kt2EODe59V6Zk6EpL+cbJfHxiHr9qOdzdxf j5n+EN4SlfA9wEDUKbVqqRArXA6BYLXSIz/O7aM+NOpz0+G+sHz8fynwBEJFhu/ID2Z4 NVbPnsglGivhYL++vfi2/5qzyMjhOBasLOb+QZqhyO9riZufyFAA7cofJ8HOsHyM4H4H I8rzeDeT8ptvfRBISSvDo1bNvPaUvsVlS02dV62PkiZcqdpJFm0UtJoDX6To8uZ2btwC nOn3pePUaVfvS0DyuSlR6Pjwm4qOqBJhVOgcMXWE7YCASaz+us58Ne/n8gLkrr3u/j09 R5gg== X-Gm-Message-State: AOJu0Yw6kFfg7ByKVqsJNpD4lvkJ5MsQhv4WgiLYSigaYHp3CGAnp9U8 7nvGVRiGhCgGPB+kDnXT20CakNqYwmhSbDfl2jUjKdu44wBpNSe/uWUKhgcSUXtCkzk/Tlwo6gO 0 X-Google-Smtp-Source: AGHT+IF3i2V4C8IrT0xG1QtMBdatvGwAt1q9obgLDlgBD01dAWvBGKrSS4ch3yan9selOlL5uX1L8g== X-Received: by 2002:a05:651c:151:b0:2de:22b2:ab3d with SMTP id c17-20020a05651c015100b002de22b2ab3dmr1530149ljd.7.1714121250750; Fri, 26 Apr 2024 01:47:30 -0700 (PDT) From: Jens Wiklander To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, Jens Wiklander , Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel Subject: [XEN PATCH v3 3/5] xen/arm: ffa: simplify ffa_handle_mem_share() Date: Fri, 26 Apr 2024 10:47:21 +0200 Message-Id: <20240426084723.4149648-4-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240426084723.4149648-1-jens.wiklander@linaro.org> References: <20240426084723.4149648-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714121274951100005 Content-Type: text/plain; charset="utf-8" Simplify ffa_handle_mem_share() by removing the start_page_idx and last_page_idx parameters from get_shm_pages() and check that the number of pages matches expectations at the end of get_shm_pages(). Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa_shm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/tee/ffa_shm.c b/xen/arch/arm/tee/ffa_shm.c index 75a5b66aeb4c..370d83ec5cf8 100644 --- a/xen/arch/arm/tee/ffa_shm.c +++ b/xen/arch/arm/tee/ffa_shm.c @@ -159,10 +159,9 @@ static int32_t ffa_mem_reclaim(uint32_t handle_lo, uin= t32_t handle_hi, */ static int get_shm_pages(struct domain *d, struct ffa_shm_mem *shm, const struct ffa_address_range *range, - uint32_t range_count, unsigned int start_page_idx, - unsigned int *last_page_idx) + uint32_t range_count) { - unsigned int pg_idx =3D start_page_idx; + unsigned int pg_idx =3D 0; gfn_t gfn; unsigned int n; unsigned int m; @@ -191,7 +190,9 @@ static int get_shm_pages(struct domain *d, struct ffa_s= hm_mem *shm, } } =20 - *last_page_idx =3D pg_idx; + /* The ranges must add up */ + if ( pg_idx < shm->page_count ) + return FFA_RET_INVALID_PARAMETERS; =20 return FFA_RET_OK; } @@ -460,7 +461,6 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) struct domain *d =3D current->domain; struct ffa_ctx *ctx =3D d->arch.tee; struct ffa_shm_mem *shm =3D NULL; - unsigned int last_page_idx =3D 0; register_t handle_hi =3D 0; register_t handle_lo =3D 0; int ret =3D FFA_RET_DENIED; @@ -570,15 +570,9 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs) goto out; } =20 - ret =3D get_shm_pages(d, shm, region_descr->address_range_array, range= _count, - 0, &last_page_idx); + ret =3D get_shm_pages(d, shm, region_descr->address_range_array, range= _count); if ( ret ) goto out; - if ( last_page_idx !=3D shm->page_count ) - { - ret =3D FFA_RET_INVALID_PARAMETERS; - goto out; - } =20 /* Note that share_shm() uses our tx buffer */ spin_lock(&ffa_tx_buffer_lock); --=20 2.34.1 From nobody Sun May 19 07:16:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714121275; cv=none; d=zohomail.com; s=zohoarc; b=KVP/cNZmWawtXEnd1ixBijoTTqg7ovW34O2Xp7Qfwo2jIucDm02Ph04uxYFBbe9B+DbZ4h273WRQVjrTE8GgfURKLNesDInPppmOtNaMkWIHugbu8eubIiK5rJYVEtpULf2UnW9KjO8qYq4sry0EgIlzbFT02FE6D0vnyBlBHb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714121275; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vY+o1NaF0jtuDDIggPOkYczyVEr+NXWFJijZDJ7/aOs=; b=G4K2YnIoyrKR/LqVR5UP8WZFb1lWNfUJY9nRjTmIAki5lBJhnMDEvqpvCUv5usRKcqGWs3p4UTLaC/p0Fzg2hBeex6TUgG7lcBjhYfbhsTw2DD9cLAlMPIRYHam7EFOgHycV5kI07YgjMjRR3al5KgawxWzuIIEgBKEvUmzlakM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714121275981737.9966774351087; Fri, 26 Apr 2024 01:47:55 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712550.1113322 (Exim 4.92) (envelope-from ) id 1s0HF2-0008UP-H6; Fri, 26 Apr 2024 08:47:36 +0000 Received: by outflank-mailman (output) from mailman id 712550.1113322; Fri, 26 Apr 2024 08:47:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HF2-0008UB-Da; Fri, 26 Apr 2024 08:47:36 +0000 Received: by outflank-mailman (input) for mailman id 712550; Fri, 26 Apr 2024 08:47:34 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HF0-0007TR-Lw for xen-devel@lists.xenproject.org; Fri, 26 Apr 2024 08:47:34 +0000 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [2a00:1450:4864:20::631]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9f485380-03a9-11ef-b4bb-af5377834399; Fri, 26 Apr 2024 10:47:33 +0200 (CEST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a58c09e2187so141692266b.3 for ; Fri, 26 Apr 2024 01:47:33 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id qu20-20020a170907111400b00a5242ec4573sm10339211ejb.29.2024.04.26.01.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 01:47:31 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9f485380-03a9-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714121252; x=1714726052; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vY+o1NaF0jtuDDIggPOkYczyVEr+NXWFJijZDJ7/aOs=; b=uA4yN5xMCmGS7wrTJnyA7AVoSB/l/mg0Uq7gPQVvfJg/RppPt3823RLesK3XzASs4X I+LlMCE/GLnzRRbCc+W2JtIe4AF5li8tEaj8CMP+5aEPqAiKn495hbxCOtp1XHafEWtQ NGzgjtT8cab4aDaVnHXSgsxKe4XnJKojBxwT40zK4JK0/Sucgnz1p1PIdeGjHEBvyNcd Vf7erPHHiCtQwaS8Nfdkg+VfEgHKefN2I3f3HdyEmqrCsuD0KpNkruohU76P2RvB/4EB Yj8uqJubnsGNWpr/AoT5/ij8RSAOEwgKm+3W9lTio38W18mA2UAaQX2H+uRfgy9bUjM+ YA2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714121252; x=1714726052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vY+o1NaF0jtuDDIggPOkYczyVEr+NXWFJijZDJ7/aOs=; b=lSMC4vVuLjz0fAhPHmQWyMSO0RCkkKp2HXBnA4Yo7xYyezP+h7sOVX/3WqlEGF04Q8 RLtoecO/VVwTJLzZH2iuHkRV3akGHaolW3qgJUkXwl8wFF/gxh2Vj9YHdjdCviYF3VLu 9x0w8J2Rakb2cRJNIGEHVUEk3AgFtI2qEv4CRzYUh3TDZ6xUfeX3f6FxT5USCRNMf0If Xdgy6FsqdVKeS/VSoVZ7V7IuJD1VLauvrhiEAOGpxbYJdHwz5e6QmZnY2iFT8Q6RnAk1 ozuk5Mt7/gRbEYrqoM3FX6iStetWbWI7OTKams+adkDK2/1wKGbAb8ekYbJ2ktWMBs/y 9qpQ== X-Gm-Message-State: AOJu0Yzt+3of5rtCGFURdwp0r9mOdWUXMcWwnPU/pehp9SndnNBueCjJ A1pHx/hFQno0g9hV7Os/e6gMhMlYST45p+2YWOvH46zg/hWlmF2RGNbJERO0FQAV5EiAdJ/0402 5 X-Google-Smtp-Source: AGHT+IEXwKsCHCGLpp8w1XmABrBJFqqpTUBCzfdvoWLHOAMUTQltzhiaFhCmRF5AymjDB95q4OMizQ== X-Received: by 2002:a17:906:1901:b0:a58:7941:2718 with SMTP id a1-20020a170906190100b00a5879412718mr1484090eje.47.1714121252135; Fri, 26 Apr 2024 01:47:32 -0700 (PDT) From: Jens Wiklander To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, Jens Wiklander , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk Subject: [XEN PATCH v3 4/5] xen/arm: allow dynamically assigned SGI handlers Date: Fri, 26 Apr 2024 10:47:22 +0200 Message-Id: <20240426084723.4149648-5-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240426084723.4149648-1-jens.wiklander@linaro.org> References: <20240426084723.4149648-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714121276968100008 Content-Type: text/plain; charset="utf-8" Updates so request_irq() can be used with a dynamically assigned SGI irq as input. This prepares for a later patch where an FF-A schedule receiver interrupt handler is installed for an SGI generated by the secure world. From the Arm Base System Architecture v1.0C [1]: "The system shall implement at least eight Non-secure SGIs, assigned to interrupt IDs 0-7." gic_route_irq_to_xen() don't gic_set_irq_type() for SGIs since they are always edge triggered. gic_interrupt() is updated to route the dynamically assigned SGIs to do_IRQ() instead of do_sgi(). The latter still handles the statically assigned SGI handlers like for instance GIC_SGI_CALL_FUNCTION. [1] https://developer.arm.com/documentation/den0094/ Signed-off-by: Jens Wiklander --- v2->v3 - Rename GIC_SGI_MAX to GIC_SGI_STATIC_MAX and rename do_sgi() to do_static_sgi() - Update comment in setup_irq() to mention that SGI irq_desc is banked - Add ASSERT() in do_IRQ() that the irq isn't an SGI before injecting calling vgic_inject_irq() - Initialize local_irqs_type[] range for SGIs as IRQ_TYPE_EDGE_RISING - Adding link to the Arm Base System Architecture v1.0C v1->v2 - Update patch description as requested --- xen/arch/arm/gic.c | 12 +++++++----- xen/arch/arm/include/asm/gic.h | 2 +- xen/arch/arm/irq.c | 18 ++++++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 44c40e86defe..882768252740 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -38,7 +38,7 @@ const struct gic_hw_operations *gic_hw_ops; static void __init __maybe_unused build_assertions(void) { /* Check our enum gic_sgi only covers SGIs */ - BUILD_BUG_ON(GIC_SGI_MAX > NR_GIC_SGI); + BUILD_BUG_ON(GIC_SGI_STATIC_MAX > NR_GIC_SGI); } =20 void register_gic_ops(const struct gic_hw_operations *ops) @@ -117,7 +117,9 @@ void gic_route_irq_to_xen(struct irq_desc *desc, unsign= ed int priority) =20 desc->handler =3D gic_hw_ops->gic_host_irq_type; =20 - gic_set_irq_type(desc, desc->arch.type); + /* SGIs are always edge-triggered, so there is need to set it */ + if ( desc->irq >=3D NR_GIC_SGI) + gic_set_irq_type(desc, desc->arch.type); gic_set_irq_priority(desc, priority); } =20 @@ -330,7 +332,7 @@ void gic_disable_cpu(void) gic_hw_ops->disable_interface(); } =20 -static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) +static void do_static_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) { struct irq_desc *desc =3D irq_to_desc(sgi); =20 @@ -375,7 +377,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_f= iq) /* Reading IRQ will ACK it */ irq =3D gic_hw_ops->read_irq(); =20 - if ( likely(irq >=3D 16 && irq < 1020) ) + if ( likely(irq >=3D GIC_SGI_STATIC_MAX && irq < 1020) ) { isb(); do_IRQ(regs, irq, is_fiq); @@ -387,7 +389,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_f= iq) } else if ( unlikely(irq < 16) ) { - do_sgi(regs, irq); + do_static_sgi(regs, irq); } else { diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 03f209529b13..541f0eeb808a 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -285,7 +285,7 @@ enum gic_sgi { GIC_SGI_EVENT_CHECK, GIC_SGI_DUMP_STATE, GIC_SGI_CALL_FUNCTION, - GIC_SGI_MAX, + GIC_SGI_STATIC_MAX, }; =20 /* SGI irq mode types */ diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index bcce80a4d624..d7306aa64d50 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -152,7 +152,13 @@ void __init init_IRQ(void) =20 spin_lock(&local_irqs_type_lock); for ( irq =3D 0; irq < NR_LOCAL_IRQS; irq++ ) - local_irqs_type[irq] =3D IRQ_TYPE_INVALID; + { + /* SGIs are always edge-triggered */ + if ( irq < NR_GIC_SGI ) + local_irqs_type[irq] =3D DT_IRQ_TYPE_EDGE_RISING; + else + local_irqs_type[irq] =3D IRQ_TYPE_INVALID; + } spin_unlock(&local_irqs_type_lock); =20 BUG_ON(init_local_irq_data(smp_processor_id()) < 0); @@ -224,9 +230,12 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int i= rq, int is_fiq) =20 perfc_incr(irqs); =20 - ASSERT(irq >=3D 16); /* SGIs do not come down this path */ + /* Statically assigned SGIs do not come down this path */ + ASSERT(irq >=3D GIC_SGI_STATIC_MAX); =20 - if ( irq < 32 ) + if ( irq < NR_GIC_SGI ) + perfc_incr(ipis); + else if ( irq < NR_GIC_LOCAL_IRQS ) perfc_incr(ppis); else perfc_incr(spis); @@ -260,6 +269,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int ir= q, int is_fiq) * The irq cannot be a PPI, we only support delivery of SPIs to * guests. */ + ASSERT(irq >=3D NR_GIC_SGI); vgic_inject_irq(info->d, NULL, info->virq, true); goto out_no_end; } @@ -396,7 +406,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, = struct irqaction *new) { gic_route_irq_to_xen(desc, GIC_PRI_IRQ); /* It's fine to use smp_processor_id() because: - * For PPI: irq_desc is banked + * For SGI and PPI: irq_desc is banked * For SPI: we don't care for now which CPU will receive the * interrupt * TODO: Handle case where SPI is setup on different CPU than --=20 2.34.1 From nobody Sun May 19 07:16:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714121280; cv=none; d=zohomail.com; s=zohoarc; b=J/8/3wBJYgKsqUuu3llF15ZpE4ID3/pJeu5nIZ3WGTdR4Ec1eERU/Eh3dv+NCRzOICqAjGPRaROL9j5SwUwYp7LAQRAbZkDazlA5Rv2dykbnJMd3lRLedE42yCM8+a06ALxHgkGB0382kKz+RAtVQUuUTBC5wS1mbveBdiEpRvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714121280; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RHSWtdZOQjsFoB8sDEa4JwrK3cDpEUyTn/mEojnjoVI=; b=hjpu+YB9wNzovvrFRs2eZ3xOD08h4m4vmHEJTWqr3mWvGGSDcxqzBpiOf/DbPO2hGnTRWpAzent+19elpvDyIgnMXImRKfE6XgU3yC+BfVALB3GkLTJ9VN9rfAtdzh3u8S9sehR1GOqQgubDiQwV/kEbNU022+MtNMbNoN/id/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1714121280149611.6625234458122; Fri, 26 Apr 2024 01:48:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.712551.1113332 (Exim 4.92) (envelope-from ) id 1s0HF5-0000Oq-Sf; Fri, 26 Apr 2024 08:47:39 +0000 Received: by outflank-mailman (output) from mailman id 712551.1113332; Fri, 26 Apr 2024 08:47:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HF5-0000Of-OA; Fri, 26 Apr 2024 08:47:39 +0000 Received: by outflank-mailman (input) for mailman id 712551; Fri, 26 Apr 2024 08:47:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s0HF3-0007TR-G3 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2024 08:47:37 +0000 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [2a00:1450:4864:20::236]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a05f6670-03a9-11ef-b4bb-af5377834399; Fri, 26 Apr 2024 10:47:35 +0200 (CEST) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2def8e58471so23887871fa.0 for ; Fri, 26 Apr 2024 01:47:35 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id qu20-20020a170907111400b00a5242ec4573sm10339211ejb.29.2024.04.26.01.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 01:47:32 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a05f6670-03a9-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714121254; x=1714726054; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RHSWtdZOQjsFoB8sDEa4JwrK3cDpEUyTn/mEojnjoVI=; b=CGHmhVy1KGtYK7dsZgum8AyKG+BIO20x8YXLOmg2nzlNxbdKi3kgagUkkU5wevCcxv fKjL9EfqU8YOy+p23RCasguCg4cDM0ll934iIVH32tRMKO8GGJSwXsjXzwQKiy8S3gkE FCtII6TYnUA+rqCHCnrDDa2Qjl5saQpICWF/0GYOudvC4p7zqvxCxXfl6U68By85NpjB LfPdLlCPMqDON3tcEYquIaWhSL6cx/yczaY4rbh4HlT4cbhNJerQ2IVwsa/U57Dvbikt zMp4iEwhTOlmSvrOw8F5O88N067DTLoCbE8UiXULc+yeEt+C1FHiaekwdbdRZWSIKvKG edbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714121254; x=1714726054; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RHSWtdZOQjsFoB8sDEa4JwrK3cDpEUyTn/mEojnjoVI=; b=cMIOwgAZIECx0pIpkSGyMA9LlKHxKvCSGL2dUm9DV0LEuRzGNCvXyoPxHopKLuyF/3 pG8mdgZ9/E+6Y+rRRWkcvJrLrbs6jV776affcduBUP+ALL1O4u4uwj6IYmQ57E8YlG5m pXanFFwph8x5gi583x3m7Ke7G5DYH3KMlQ1kR1NLyxMxifBkOdjLOyjjicxRte+jFdb1 7YHSn7q50sHhR/uOp3Mpwo/BIk38gaIM4pAOlNldmZX4vzhokUuEhuIxj7g1rHaNcZhm v70fXrpXtzRDDt0192F7KWQjMn7hQnKltms75FEltTjVw7yAQu75aHkZxPfU2lTnRM3d TS1Q== X-Gm-Message-State: AOJu0Yx0c+JDPcrCNOlR9Q52b43uP0xkIghpFk3YKDnybNcUdH5Un+KW TUFxosR7uDb11+J96Z0ANwO4xfRlf4zcaxfOjXpZL9lfQUpHzdBkCJDS0DxKkNTBRZ2Crrob8vR k X-Google-Smtp-Source: AGHT+IFvXMIDMJGUFtzyhWHNyezkT9SoTbHU/xTai6NVG/UFirbvJYwt8xwH3V54pUo4P+KuD/oLXA== X-Received: by 2002:a19:6907:0:b0:51c:1657:b04a with SMTP id e7-20020a196907000000b0051c1657b04amr1400347lfc.63.1714121253478; Fri, 26 Apr 2024 01:47:33 -0700 (PDT) From: Jens Wiklander To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, Jens Wiklander , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk Subject: [XEN PATCH v3 5/5] xen/arm: ffa: support notification Date: Fri, 26 Apr 2024 10:47:23 +0200 Message-Id: <20240426084723.4149648-6-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240426084723.4149648-1-jens.wiklander@linaro.org> References: <20240426084723.4149648-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714121281031100001 Content-Type: text/plain; charset="utf-8" Add support for FF-A notifications, currently limited to an SP (Secure Partition) sending an asynchronous notification to a guest. Guests and Xen itself are made aware of pending notifications with an interrupt. The interrupt handler retrieves the notifications using the FF-A ABI and deliver them to their destinations. Update ffa_partinfo_domain_init() to return error code like ffa_notif_domain_init(). Signed-off-by: Jens Wiklander --- v2->v3: - Add a GUEST_ prefix and move FFA_NOTIF_PEND_INTR_ID and FFA_SCHEDULE_RECV_INTR_ID to public/arch-arm.h - Register the Xen SRI handler on each CPU using on_selected_cpus() and setup_irq() - Check that the SGI ID retrieved with FFA_FEATURE_SCHEDULE_RECV_INTR doesn't conflict with static SGI handlers v1->v2: - Addressing review comments - Change ffa_handle_notification_{bind,unbind,set}() to take struct cpu_user_regs *regs as argument. - Update ffa_partinfo_domain_init() and ffa_notif_domain_init() to return an error code. - Fixing a bug in handle_features() for FFA_FEATURE_SCHEDULE_RECV_INTR. --- xen/arch/arm/irq.c | 2 +- xen/arch/arm/tee/Makefile | 1 + xen/arch/arm/tee/ffa.c | 55 ++++- xen/arch/arm/tee/ffa_notif.c | 378 ++++++++++++++++++++++++++++++++ xen/arch/arm/tee/ffa_partinfo.c | 9 +- xen/arch/arm/tee/ffa_private.h | 56 ++++- xen/include/public/arch-arm.h | 14 ++ 7 files changed, 507 insertions(+), 8 deletions(-) create mode 100644 xen/arch/arm/tee/ffa_notif.c diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index d7306aa64d50..5224898265a5 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -155,7 +155,7 @@ void __init init_IRQ(void) { /* SGIs are always edge-triggered */ if ( irq < NR_GIC_SGI ) - local_irqs_type[irq] =3D DT_IRQ_TYPE_EDGE_RISING; + local_irqs_type[irq] =3D IRQ_TYPE_EDGE_RISING; else local_irqs_type[irq] =3D IRQ_TYPE_INVALID; } diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile index f0112a2f922d..7c0f46f7f446 100644 --- a/xen/arch/arm/tee/Makefile +++ b/xen/arch/arm/tee/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_FFA) +=3D ffa.o obj-$(CONFIG_FFA) +=3D ffa_shm.o obj-$(CONFIG_FFA) +=3D ffa_partinfo.o obj-$(CONFIG_FFA) +=3D ffa_rxtx.o +obj-$(CONFIG_FFA) +=3D ffa_notif.o obj-y +=3D tee.o obj-$(CONFIG_OPTEE) +=3D optee.o diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 5209612963e1..912e905a27bd 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -39,6 +39,9 @@ * - at most 32 shared memory regions per guest * o FFA_MSG_SEND_DIRECT_REQ: * - only supported from a VM to an SP + * o FFA_NOTIFICATION_*: + * - only supports global notifications, that is, per vCPU notifications + * are not supported * * There are some large locked sections with ffa_tx_buffer_lock and * ffa_rx_buffer_lock. Especially the ffa_tx_buffer_lock spinlock used @@ -194,6 +197,8 @@ out: =20 static void handle_features(struct cpu_user_regs *regs) { + struct domain *d =3D current->domain; + struct ffa_ctx *ctx =3D d->arch.tee; uint32_t a1 =3D get_user_reg(regs, 1); unsigned int n; =20 @@ -240,6 +245,30 @@ static void handle_features(struct cpu_user_regs *regs) BUILD_BUG_ON(PAGE_SIZE !=3D FFA_PAGE_SIZE); ffa_set_regs_success(regs, 0, 0); break; + case FFA_FEATURE_NOTIF_PEND_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_NOTIF_PEND_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + case FFA_FEATURE_SCHEDULE_RECV_INTR: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, GUEST_FFA_SCHEDULE_RECV_INTR_ID, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; + + case FFA_NOTIFICATION_BIND: + case FFA_NOTIFICATION_UNBIND: + case FFA_NOTIFICATION_GET: + case FFA_NOTIFICATION_SET: + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + if ( ctx->notif.enabled ) + ffa_set_regs_success(regs, 0, 0); + else + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + break; default: ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); break; @@ -305,6 +334,22 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) get_user_reg(regs, 1)= ), get_user_reg(regs, 3)); break; + case FFA_NOTIFICATION_BIND: + e =3D ffa_handle_notification_bind(regs); + break; + case FFA_NOTIFICATION_UNBIND: + e =3D ffa_handle_notification_unbind(regs); + break; + case FFA_NOTIFICATION_INFO_GET_32: + case FFA_NOTIFICATION_INFO_GET_64: + ffa_handle_notification_info_get(regs); + return true; + case FFA_NOTIFICATION_GET: + ffa_handle_notification_get(regs); + return true; + case FFA_NOTIFICATION_SET: + e =3D ffa_handle_notification_set(regs); + break; =20 default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); @@ -322,6 +367,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) static int ffa_domain_init(struct domain *d) { struct ffa_ctx *ctx; + int ret; =20 if ( !ffa_version ) return -ENODEV; @@ -345,10 +391,11 @@ static int ffa_domain_init(struct domain *d) * error, so no need for cleanup in this function. */ =20 - if ( !ffa_partinfo_domain_init(d) ) - return -EIO; + ret =3D ffa_partinfo_domain_init(d); + if ( ret ) + return ret; =20 - return 0; + return ffa_notif_domain_init(d); } =20 static void ffa_domain_teardown_continue(struct ffa_ctx *ctx, bool first_t= ime) @@ -423,6 +470,7 @@ static int ffa_domain_teardown(struct domain *d) return 0; =20 ffa_rxtx_domain_destroy(d); + ffa_notif_domain_destroy(d); =20 ffa_domain_teardown_continue(ctx, true /* first_time */); =20 @@ -502,6 +550,7 @@ static bool ffa_probe(void) if ( !ffa_partinfo_init() ) goto err_rxtx_destroy; =20 + ffa_notif_init(); INIT_LIST_HEAD(&ffa_teardown_head); init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); =20 diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c new file mode 100644 index 000000000000..6bb0804ee2f8 --- /dev/null +++ b/xen/arch/arm/tee/ffa_notif.c @@ -0,0 +1,378 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2024 Linaro Limited + */ + +#include +#include +#include +#include + +#include +#include + +#include "ffa_private.h" + +static bool __ro_after_init notif_enabled; + +int ffa_handle_notification_bind(struct cpu_user_regs *regs) +{ + struct domain *d =3D current->domain; + uint32_t src_dst =3D get_user_reg(regs, 1); + uint32_t flags =3D get_user_reg(regs, 2); + uint32_t bitmap_lo =3D get_user_reg(regs, 3); + uint32_t bitmap_hi =3D get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) !=3D ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + if ( flags ) /* Only global notifications are supported */ + return FFA_RET_DENIED; + + /* + * We only support notifications from SP so no need to check the sender + * endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, bitmap_h= i, + bitmap_lo); +} + +int ffa_handle_notification_unbind(struct cpu_user_regs *regs) +{ + struct domain *d =3D current->domain; + uint32_t src_dst =3D get_user_reg(regs, 1); + uint32_t bitmap_lo =3D get_user_reg(regs, 3); + uint32_t bitmap_hi =3D get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst & 0xFFFFU) !=3D ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* + * We only support notifications from SP so no need to check the + * destination endpoint ID, the SPMC will take care of that for us. + */ + return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_hi, + bitmap_lo); +} + +void ffa_handle_notification_info_get(struct cpu_user_regs *regs) +{ + struct domain *d =3D current->domain; + struct ffa_ctx *ctx =3D d->arch.tee; + bool pending_global; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + spin_lock(&ctx->notif.lock); + pending_global =3D ctx->notif.secure_pending; + ctx->notif.secure_pending =3D false; + spin_unlock(&ctx->notif.lock); + + if ( pending_global ) + { + /* A pending global notification for the guest */ + ffa_set_regs(regs, FFA_SUCCESS_64, 0, + 1U << FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT, ffa_get_vm_i= d(d), + 0, 0, 0, 0); + } + else + { + /* Report an error if there where no pending global notification */ + ffa_set_regs_error(regs, FFA_RET_NO_DATA); + } +} + +void ffa_handle_notification_get(struct cpu_user_regs *regs) +{ + struct domain *d =3D current->domain; + uint32_t recv =3D get_user_reg(regs, 1); + uint32_t flags =3D get_user_reg(regs, 2); + uint32_t w2 =3D 0; + uint32_t w3 =3D 0; + uint32_t w4 =3D 0; + uint32_t w5 =3D 0; + uint32_t w6 =3D 0; + uint32_t w7 =3D 0; + + if ( !notif_enabled ) + { + ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); + return; + } + + if ( (recv & 0xFFFFU) !=3D ffa_get_vm_id(d) ) + { + ffa_set_regs_error(regs, FFA_RET_INVALID_PARAMETERS); + return; + } + + if ( flags & ( FFA_NOTIF_FLAG_BITMAP_SP | FFA_NOTIF_FLAG_BITMAP_SPM ) ) + { + struct arm_smccc_1_2_regs arg =3D { + .a0 =3D FFA_NOTIFICATION_GET, + .a1 =3D recv, + .a2 =3D flags & ( FFA_NOTIF_FLAG_BITMAP_SP | + FFA_NOTIF_FLAG_BITMAP_SPM ), + }; + struct arm_smccc_1_2_regs resp; + int32_t e; + + arm_smccc_1_2_smc(&arg, &resp); + e =3D ffa_get_ret_code(&resp); + if ( e ) + { + ffa_set_regs_error(regs, e); + return; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) + { + w2 =3D resp.a2; + w3 =3D resp.a3; + } + + if ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) + w6 =3D resp.a6; + } + + ffa_set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, w4, w5, w6, w7); +} + +int ffa_handle_notification_set(struct cpu_user_regs *regs) +{ + struct domain *d =3D current->domain; + uint32_t src_dst =3D get_user_reg(regs, 1); + uint32_t flags =3D get_user_reg(regs, 2); + uint32_t bitmap_lo =3D get_user_reg(regs, 3); + uint32_t bitmap_hi =3D get_user_reg(regs, 4); + + if ( !notif_enabled ) + return FFA_RET_NOT_SUPPORTED; + + if ( (src_dst >> 16) !=3D ffa_get_vm_id(d) ) + return FFA_RET_INVALID_PARAMETERS; + + /* Let the SPMC check the destination of the notification */ + return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, + bitmap_hi); +} + +/* + * Extract a 16-bit ID (index n) from the successful return value from + * FFA_NOTIFICATION_INFO_GET_64 or FFA_NOTIFICATION_INFO_GET_32. IDs are + * returned in registers 3 to 7 with four IDs per register for 64-bit + * calling convention and two IDs per register for 32-bit calling + * convention. + */ +static uint16_t get_id_from_resp(struct arm_smccc_1_2_regs *resp, + unsigned int n) +{ + unsigned int ids_per_reg; + unsigned int reg_idx; + unsigned int reg_shift; + + if ( smccc_is_conv_64(resp->a0) ) + ids_per_reg =3D 4; + else + ids_per_reg =3D 2; + + reg_idx =3D n / ids_per_reg + 3; + reg_shift =3D ( n % ids_per_reg ) * 16; + + switch ( reg_idx ) + { + case 3: + return resp->a3 >> reg_shift; + case 4: + return resp->a4 >> reg_shift; + case 5: + return resp->a5 >> reg_shift; + case 6: + return resp->a6 >> reg_shift; + case 7: + return resp->a7 >> reg_shift; + default: + ASSERT(0); /* "Can't happen" */ + return 0; + } +} + +static void notif_irq_handler(int irq, void *data) +{ + const struct arm_smccc_1_2_regs arg =3D { + .a0 =3D FFA_NOTIFICATION_INFO_GET_64, + }; + struct arm_smccc_1_2_regs resp; + unsigned int id_pos; + unsigned int list_count; + uint64_t ids_count; + unsigned int n; + int32_t res; + + do { + arm_smccc_1_2_smc(&arg, &resp); + res =3D ffa_get_ret_code(&resp); + if ( res ) + { + if ( res !=3D FFA_RET_NO_DATA ) + printk(XENLOG_ERR "ffa: notification info get failed: erro= r %d\n", + res); + return; + } + + ids_count =3D resp.a2 >> FFA_NOTIF_INFO_GET_ID_LIST_SHIFT; + list_count =3D ( resp.a2 >> FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT ) & + FFA_NOTIF_INFO_GET_ID_COUNT_MASK; + + id_pos =3D 0; + for ( n =3D 0; n < list_count; n++ ) + { + unsigned int count =3D ((ids_count >> 2 * n) & 0x3) + 1; + struct domain *d; + + d =3D ffa_get_domain_by_vm_id(get_id_from_resp(&resp, id_pos)); + + if ( d ) + { + struct ffa_ctx *ctx =3D d->arch.tee; + + spin_lock(&ctx->notif.lock); + ctx->notif.secure_pending =3D true; + spin_unlock(&ctx->notif.lock); + + /* + * Since we're only delivering global notification, always + * deliver to the first vCPU. It doesn't matter which we + * chose, as long as it's available. + */ + vgic_inject_irq(d, d->vcpu[0], GUEST_FFA_NOTIF_PEND_INTR_I= D, + true); + + put_domain(d); + } + + id_pos +=3D count; + } + + } while (resp.a2 & FFA_NOTIF_INFO_GET_MORE_FLAG); +} + +static int32_t ffa_notification_bitmap_create(uint16_t vm_id, + uint32_t vcpu_count) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_CREATE, vm_id, vcpu_cou= nt, + 0, 0); +} + +static int32_t ffa_notification_bitmap_destroy(uint16_t vm_id) +{ + return ffa_simple_call(FFA_NOTIFICATION_BITMAP_DESTROY, vm_id, 0, 0, 0= ); +} + +struct notif_irq_info { + unsigned int irq; + int ret; + struct irqaction *action; +}; + +static void notif_irq_enable(void *info) +{ + struct notif_irq_info *irq_info =3D info; + + irq_info->ret =3D setup_irq(irq_info->irq, 0, irq_info->action); + if ( irq_info->ret ) + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + irq_info->irq, irq_info->ret); +} + +void ffa_notif_init(void) +{ + const struct arm_smccc_1_2_regs arg =3D { + .a0 =3D FFA_FEATURES, + .a1 =3D FFA_FEATURE_SCHEDULE_RECV_INTR, + }; + struct notif_irq_info irq_info =3D { }; + struct arm_smccc_1_2_regs resp; + unsigned int cpu; + + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 !=3D FFA_SUCCESS_32 ) + return; + + irq_info.irq =3D resp.a2; + if ( irq_info.irq < GIC_SGI_STATIC_MAX || irq_info.irq >=3D NR_GIC_SGI= ) + { + printk(XENLOG_ERR "ffa: notification initialization failed: confli= cting SGI %u\n", + irq_info.irq); + return; + } + + /* + * SGIs are per-CPU so we must enable the IRQ on each CPU. We use an + * IPI to call notif_irq_enable() on each CPU including the current + * CPU. The struct irqaction is preallocated since we can't allocate + * memory while in interrupt context. + */ + for_each_online_cpu(cpu) + { + irq_info.action =3D xmalloc(struct irqaction); + if ( !irq_info.action ) + { + irq_info.ret =3D -ENOMEM; + break; + } + + *irq_info.action =3D (struct irqaction){ + .handler =3D notif_irq_handler, + .name =3D "FF-A notif", + .free_on_release =3D 1, + }; + + on_selected_cpus(cpumask_of(cpu), notif_irq_enable, &irq_info, 1); + if ( irq_info.ret ) + { + XFREE(irq_info.action); + break; + } + } + + notif_enabled =3D !irq_info.ret; +} + +int ffa_notif_domain_init(struct domain *d) +{ + struct ffa_ctx *ctx =3D d->arch.tee; + int32_t res; + + if ( !notif_enabled ) + return 0; + + res =3D ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); + if ( res ) + return -ENOMEM; + + ctx->notif.enabled =3D true; + + return 0; +} + +void ffa_notif_domain_destroy(struct domain *d) +{ + struct ffa_ctx *ctx =3D d->arch.tee; + + if ( ctx->notif.enabled ) + { + ffa_notification_bitmap_destroy(ffa_get_vm_id(d)); + ctx->notif.enabled =3D false; + } +} diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinf= o.c index dc1059584828..93a03c6bc672 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -306,7 +306,7 @@ static void vm_destroy_bitmap_init(struct ffa_ctx *ctx, } } =20 -bool ffa_partinfo_domain_init(struct domain *d) +int ffa_partinfo_domain_init(struct domain *d) { unsigned int count =3D BITS_TO_LONGS(subscr_vm_destroyed_count); struct ffa_ctx *ctx =3D d->arch.tee; @@ -315,7 +315,7 @@ bool ffa_partinfo_domain_init(struct domain *d) =20 ctx->vm_destroy_bitmap =3D xzalloc_array(unsigned long, count); if ( !ctx->vm_destroy_bitmap ) - return false; + return -ENOMEM; =20 for ( n =3D 0; n < subscr_vm_created_count; n++ ) { @@ -330,7 +330,10 @@ bool ffa_partinfo_domain_init(struct domain *d) } vm_destroy_bitmap_init(ctx, n); =20 - return n =3D=3D subscr_vm_created_count; + if ( n !=3D subscr_vm_created_count ) + return -EIO; + + return 0; } =20 bool ffa_partinfo_domain_destroy(struct domain *d) diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 98236cbf14a3..a59c9887774b 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -25,6 +25,7 @@ #define FFA_RET_DENIED -6 #define FFA_RET_RETRY -7 #define FFA_RET_ABORTED -8 +#define FFA_RET_NO_DATA -9 =20 /* FFA_VERSION helpers */ #define FFA_VERSION_MAJOR_SHIFT 16U @@ -175,6 +176,21 @@ */ #define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) =20 +/* Flags used in calls to FFA_NOTIFICATION_GET interface */ +#define FFA_NOTIF_FLAG_BITMAP_SP BIT(0, U) +#define FFA_NOTIF_FLAG_BITMAP_VM BIT(1, U) +#define FFA_NOTIF_FLAG_BITMAP_SPM BIT(2, U) +#define FFA_NOTIF_FLAG_BITMAP_HYP BIT(3, U) + +#define FFA_NOTIF_INFO_GET_MORE_FLAG BIT(0, U) +#define FFA_NOTIF_INFO_GET_ID_LIST_SHIFT 12 +#define FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT 7 +#define FFA_NOTIF_INFO_GET_ID_COUNT_MASK 0x1F + +/* Feature IDs used with FFA_FEATURES */ +#define FFA_FEATURE_NOTIF_PEND_INTR 0x1U +#define FFA_FEATURE_SCHEDULE_RECV_INTR 0x2U + /* Function IDs */ #define FFA_ERROR 0x84000060U #define FFA_SUCCESS_32 0x84000061U @@ -213,6 +229,27 @@ #define FFA_MEM_FRAG_TX 0x8400007BU #define FFA_MSG_SEND 0x8400006EU #define FFA_MSG_POLL 0x8400006AU +#define FFA_NOTIFICATION_BITMAP_CREATE 0x8400007DU +#define FFA_NOTIFICATION_BITMAP_DESTROY 0x8400007EU +#define FFA_NOTIFICATION_BIND 0x8400007FU +#define FFA_NOTIFICATION_UNBIND 0x84000080U +#define FFA_NOTIFICATION_SET 0x84000081U +#define FFA_NOTIFICATION_GET 0x84000082U +#define FFA_NOTIFICATION_INFO_GET_32 0x84000083U +#define FFA_NOTIFICATION_INFO_GET_64 0xC4000083U + +struct ffa_ctx_notif { + bool enabled; + + /* Used to serialize access to the rest of this struct */ + spinlock_t lock; + + /* + * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have + * pending global notifications. + */ + bool secure_pending; +}; =20 struct ffa_ctx { void *rx; @@ -228,6 +265,7 @@ struct ffa_ctx { struct list_head shm_list; /* Number of allocated shared memory object */ unsigned int shm_count; + struct ffa_ctx_notif notif; /* * tx_lock is used to serialize access to tx * rx_lock is used to serialize access to rx @@ -257,7 +295,7 @@ void ffa_handle_mem_share(struct cpu_user_regs *regs); int ffa_handle_mem_reclaim(uint64_t handle, uint32_t flags); =20 bool ffa_partinfo_init(void); -bool ffa_partinfo_domain_init(struct domain *d); +int ffa_partinfo_domain_init(struct domain *d); bool ffa_partinfo_domain_destroy(struct domain *d); int32_t ffa_handle_partition_info_get(uint32_t w1, uint32_t w2, uint32_t w= 3, uint32_t w4, uint32_t w5, uint32_t *= count, @@ -271,12 +309,28 @@ uint32_t ffa_handle_rxtx_map(uint32_t fid, register_t= tx_addr, uint32_t ffa_handle_rxtx_unmap(void); int32_t ffa_handle_rx_release(void); =20 +void ffa_notif_init(void); +int ffa_notif_domain_init(struct domain *d); +void ffa_notif_domain_destroy(struct domain *d); + +int ffa_handle_notification_bind(struct cpu_user_regs *regs); +int ffa_handle_notification_unbind(struct cpu_user_regs *regs); +void ffa_handle_notification_info_get(struct cpu_user_regs *regs); +void ffa_handle_notification_get(struct cpu_user_regs *regs); +int ffa_handle_notification_set(struct cpu_user_regs *regs); + static inline uint16_t ffa_get_vm_id(const struct domain *d) { /* +1 since 0 is reserved for the hypervisor in FF-A */ return d->domain_id + 1; } =20 +static inline struct domain *ffa_get_domain_by_vm_id(uint16_t vm_id) +{ + /* -1 to match ffa_get_vm_id() */ + return get_domain_by_id(vm_id - 1); +} + static inline void ffa_set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, register_t v2, register_t v= 3, register_t v4, register_t v5, register_t v= 6, diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index e167e14f8df9..1eac9802aa53 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -505,6 +505,7 @@ typedef uint64_t xen_callback_t; #define GUEST_MAX_VCPUS 128 =20 /* Interrupts */ + #define GUEST_TIMER_VIRT_PPI 27 #define GUEST_TIMER_PHYS_S_PPI 29 #define GUEST_TIMER_PHYS_NS_PPI 30 @@ -515,6 +516,19 @@ typedef uint64_t xen_callback_t; #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 #define GUEST_VIRTIO_MMIO_SPI_LAST 43 =20 +/* + * SGI is the preferred delivery mechanism of FF-A pending notifications or + * schedule recveive interrupt. SGIs 8-15 are normally not used by a guest + * as they in a non-virtualized system typically are assigned to the secure + * world. Here we're free to use SGI 8-15 since they are virtual and have + * nothing to do with the secure world. + * + * For partitioning of SGIs see also Arm Base System Architecture v1.0C, + * https://developer.arm.com/documentation/den0094/ + */ +#define GUEST_FFA_NOTIF_PEND_INTR_ID 8 +#define GUEST_FFA_SCHEDULE_RECV_INTR_ID 9 + /* PSCI functions */ #define PSCI_cpu_suspend 0 #define PSCI_cpu_off 1 --=20 2.34.1