From patchwork Wed Dec 1 11:15:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12649753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2230FC433EF for ; Wed, 1 Dec 2021 11:16:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.235898.409173 (Exim 4.92) (envelope-from ) id 1msNas-0007wy-FJ; Wed, 01 Dec 2021 11:16:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 235898.409173; Wed, 01 Dec 2021 11:16:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msNas-0007wr-Al; Wed, 01 Dec 2021 11:16:10 +0000 Received: by outflank-mailman (input) for mailman id 235898; Wed, 01 Dec 2021 11:16:09 +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 1msNaq-0007wa-VF for xen-devel@lists.xenproject.org; Wed, 01 Dec 2021 11:16:08 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8705fe72-5296-11ec-b945-1df2895da90e; Wed, 01 Dec 2021 12:05:02 +0100 (CET) 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: 8705fe72-5296-11ec-b945-1df2895da90e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638357366; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=akoFfWVQuW3/lSJUhlj/Ed+4xcJeZB9+aYB4pPZ2o+Y=; b=QfIcWjARg3DLQgUPIJohBG6ExzaOojb34ZtvVx0eb7JHMhBqpU+Q9c5D WKo5z+xF17Nd5dd6IieITxLKBkDYozFwWUHZXqsN3MeHeXj7rVcUkMZCl XOgPSfE0gNI9ZqtFNfHR8FBvXli0A4XV2lxmHP+6NShUTrsVrVeMUGGxj c=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Dq7kZ3HOilYplWNWU9JCLrz09ayTts7AZ3slSf4g6TPvKcHthI81diwOhxP7H5Fc8dZmov23eL VGI1G/wpKYbknKNAHPFWVdPwVt+XWcP4kOfsA7J523Itjlfmxor7E0BV5NlmSgpxWturzsDhpq R/h8nOxfHqqBrwdnaoctAuyZ8lzU1K26XGbZFTDeNMHae0jZUHmh+XkSS2Dwjg+aZrwEQXT2/N fEK1waaT2ZzNbuICEq1YjYPRQyp342kzIPgcsUQ8tIIfQ4hwVTC+TbwtE2znTTzvXcyWeBlTwO VjLV66I/wRuErXH0kt1PwmNc X-SBRS: 5.1 X-MesageID: 58996273 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:zYksZagoeEGk96n1SqXJMWwxX161uxcKZh0ujC45NGQN5FlHY01je htvDWzTaPfYZWf8Kdt+YYnj8k0FusfdyNJqSlZvryg9Qi8b9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw2IDga++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1spITraBc0A5fKp/0wDiZJCjtPEPdvreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHCOo8Ft24m5jbeFfs8GrjIQrnQ5M8e1zA17ixLNauON ptHM2U0BPjGS0RvAQ4vC6sCpbeLpmvZdzFBkXynjrVitgA/yyQuieOwYbI5YOeiSd1Om0eEp krP52njHgwBL9ub1CaE9XS3wOTImEvTVI0eGbKi/9Z2kVaTwSoVExRQWlylydGph0j7V99BJ kg8/is1sbN05EGtVsP6XRCzvDiDpBF0ZjZLO7RkskfXkPOSulvHQDhfJtJcVDA4nO4nXWcLx kK0pdXWHBEyj6yMU0OwrJ7B+FteJhMpBWMFYCYFSy4M7N/ivJw/g3rzczpzLEKmpoarQG+tm lhmuAB73uxO1pBTi81X6Hie22r0zqUlWDLZ8ek+soiNygpiLLCoaIWzgbQwxaYRdd3JJrVtU ZVtpiR/0AzsJc3d/MBuaL9UdF1M2xpjGGaH6bKIN8N8nwlBA1b5IehtDMhWfS+FyPosdz7ze 1P0sghM/pJVN3bCRfYpONLrWptynfW8SImNuhXogjxmOcMZmOivpnwGWKJt9zq1zBhEfV8XZ /93jvpA/V5FUP86nVJats8W0KMxxzBW+I8gbcuT8vhT6pLHPCT9Ye5caDOmN7llhIvZ8FS92 4sObKOilkQAONASlwGKqOb/23hRdiNlbX03wuQKHtO+zv1ORDt8VqSPmOx5IOSIXc19z4/1w 510YWcAoHKXuJENAVzihqlLZOy9UJBhg2g8OCBwb1+k12J6OdSk7bsFdotxdr4irbQxwflxR vgDWsOBHvUQFWiXp2VDNcHw/N54aRCmpQOSJC75MjIxSIFtGl7S8dj+cwqxqCRXVnirtdEzq qGL3x/ARcZRXBxrCcvbMar9z164sXUHtvh1Wk/EfotadEn2qdA4IC3tlP4nZcoLLEyblDed0 g+XBzYepPXM/NBpoIWY2/jcot7wQeVkH0dcE23K1pqMNHHXrji53ItNcOeUZjSBBmn6z7qvO LdOxPbmPfxZwFsT69hgE6xmxL4V7sf0o+MI1RxtGXjGYgj5Cr5kJXXaj8BDurcUm+1csAqyH EmO5sNbKfOCP8a8SAwdIw8sb+Ki0/AIm2aNsaRpcRuivCInrqCaVUhyPgWXjH0PJbR4B4op3 OM9tZNE8Ae4kBcrbo6Lgy08G75g9ZDcv3HLbq0nPbI= IronPort-HdrOrdr: A9a23:SepVDquJFl1eOpuJbpUz9KE67skDdNV00zEX/kB9WHVpmszxra 6TdZUgpGbJYVkqOE3I9ertBEDEewK4yXcX2/h2AV7BZniEhILAFugLhuGO/9SjIVybygc079 YGT0EUMrzN5DZB4voSmDPIceod/A== X-IronPort-AV: E=Sophos;i="5.87,278,1631592000"; d="scan'208";a="58996273" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Daniel De Graaf , Daniel Smith Subject: [PATCH 1/2] xsm: Switch xsm_ops to __alt_call_maybe_initdata Date: Wed, 1 Dec 2021 11:15:54 +0000 Message-ID: <20211201111555.16408-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20211201111555.16408-1-andrew.cooper3@citrix.com> References: <20211201111555.16408-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 This should have been done at the point xsm_ops became fully altcall'd. This puts the xsm_ops structure in .init on architectures where it is no longer referenced at runtime. Fixes: d868feb95a8a ("xen/xsm: Complete altcall conversion of xsm interface") Signed-off-by: Andrew Cooper --- CC: Daniel De Graaf CC: Daniel Smith --- xen/xsm/xsm_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 21fffbcb41d3..14d98f1f725f 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -30,7 +30,7 @@ #define XSM_FRAMEWORK_VERSION "1.0.1" -struct xsm_ops __read_mostly xsm_ops; +struct xsm_ops __alt_call_maybe_initdata xsm_ops; enum xsm_ops_state { XSM_OPS_UNREGISTERED, From patchwork Wed Dec 1 11:15:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12649755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F024EC433FE for ; Wed, 1 Dec 2021 11:16:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.235900.409195 (Exim 4.92) (envelope-from ) id 1msNau-0008Ty-VQ; Wed, 01 Dec 2021 11:16:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 235900.409195; Wed, 01 Dec 2021 11:16:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msNau-0008Tn-SM; Wed, 01 Dec 2021 11:16:12 +0000 Received: by outflank-mailman (input) for mailman id 235900; Wed, 01 Dec 2021 11:16:10 +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 1msNas-0007wa-O9 for xen-devel@lists.xenproject.org; Wed, 01 Dec 2021 11:16:10 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 88f671dd-5296-11ec-b945-1df2895da90e; Wed, 01 Dec 2021 12:05:04 +0100 (CET) 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: 88f671dd-5296-11ec-b945-1df2895da90e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638357368; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=YkekjYG04jbiZH/kfWiElK2zEy91zRt0qThwJ4BT3/4=; b=LDRcKFp6HTq9GDeKER75zQZm3REMZ7JiLRZD8mbmry763Iqx6vZyJuo8 p7W1eHornc1cbUlr+8J/xCtQt27fSrOK8tFJ0Z7VVM27xLDWfcxPM99// UndGreTdpJob4CQt6TgvXxJxOrQuQLfTnvUp7CehS4RjGEdOnjxGYmrn3 I=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: wI3yVvBLs5CHucLgP7kmdipbf3Bg7n908gjuMSJ3OitN9eVntiRfUan5P+wszZvYIQtiPOmVJB 0lxl66dN3aVuWXOoLN17kBq2H81T0IshCRTw8M0BL6i4sqso+Mpr389AmA1dzpMxDquRSxLwaF /ZV23Ky34YAmunXGO2LWfnpJNCwBrbe+UMJWwzf0o4SEZHWYG+QLhTroxFU+hwWkN/nD5xvANS jcCEWTwB9HzUQIBYjPoq1aWtiA/WQwM1N9v2hwUrL1cUknRLHCb21679F8xJfOYVLOHh8c2iuH 7tMLYdDPt/8ohOPBorVIAWVk X-SBRS: 5.1 X-MesageID: 58996274 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:uXljoK3JDKtuppUu3PbD5Qh2kn2cJEfYwER7XKvMYLTBsI5bpzAEn GEdCDuBPKnZNmWjLtx1bou+8UIAvceAy4RkTVA5pC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkS5PE3oHJ9RGQ74nRLlbHILOCan8ZqTNMEn970Es5w7dh2+aEvPDia++zk YKqyyHgEAfNNw5cagr4PIra9XuDFNyr0N8plgRWicJj5TcypFFMZH4rHomjLmOQf2VhNrXSq 9Avbl2O1jixEx8FUrtJm1tgG6EAaua60QOm0hK6V0U+6/TrS+NbPqsTbZIhhUlrZzqhvsFpk /RdqKGKTzgwE/Dzif0HYjQCOnQrVUFG0OevzXmXtMWSywvNcmf2wuUoB0YzVWEa0r8pWycUr 6VecW1TKEDY7w616OvTpu1Er8IvNsT0eqgYvWlt12rxBvc6W5HTBa7N4Le02R9t1pEfQ6yBO 6L1bxJvYBSeOCB2JmwGM6oRpb7xl1jGKRth/Qf9Sa0fvDGIkV0ZPKLWGNbNYdmLWcV9l16Vv H7b5H/+BgwGNduZ0nyO9XfEruPAkS70Qos6CKyz9vkshkaagGMUFnU+RVa95PW0lEO6c9ZeM FAPvDojq7Ao806mRcW7WAe3yENopTZFBYAWSbdjrljQlOyEuG51G1ToUBZgecR9ld8reAYs6 Uakwuz4HCZenee8HCf1GqivkRu+Pi0cLGknbCACTBcY79SLnLzfni4jXf44Tvfr04Sd9SXYh mnT8XNg3+l7Ydsjjv3jpTj6bySQSo8lp+LfziHeRSqb4wxwf+ZJjKT4uAGAvZ6swGt0J2RtX UToeeDCvIji7rnXzURhpdnh+pnyvJ5p1xWG3DZS82EJrWjFxpJaVdk4DMtCDEloKN0YXjTif VXevwhcjLcKYiD6N/4oO9LsV5l3pUQFKTgDfquPBjapSsIsHDJrAQk0PRLAt4wTuBZEfV4D1 WezLp/3UCdy5VVPxzuqXeYNuYLHNQhlrV4/savTlkz9uZLHPSb9Ye5cbDOmM7BohIvZ8V692 4sOaKO3J+B3DbSWjt//qtVIczjn7BETWPjLliCgXrLZf1c9Rjh+U6S5LHFIU9UNopm5X9zgp hmVMnK0AnKm7ZEeAQnVOH1ldp31WpNz8SAyMSA2ZA760Hk/e4e/qqwYcsJvL7Ug8eViy99yT uUEJJrcUqgeFGyf9mRPd4T5oaxjaA+v2VCEMR26bWVtZJVnXQHIpIPpJ1O96CkUAyOrnsIiu Ln8hBjDSJ8OSl06XsbbYf6i1X2run0ZlL4gVkfEOIALKk7t7JJrO2r6ifpue5MALhDKxz270 QeKAEhH+bmR8tFtqNSQ3PKKtYakFed6D3F2JWiD4ObkLzTe80qi3ZREDLSCcwfCWT6m466lf +hUka3xaaVVgFZQvoNgOL931qZitcD3rrpXwwk4TnXGa1OnVuFpLnWchJQds6RMwvlSuBesW 1LJ8d5fYO3bNMTgGV8XBQwkcuXciq1ExmiMtaw4cBfg+St63LubSkEDbRCDhRtUIKZxLI54k /wqv9Qb6lDnhxcnWjpcYvu4K4hYwqQ8bpga IronPort-HdrOrdr: A9a23:NlpJ0agrL/klote791TZpKzQfnBQXtgji2hC6mlwRA09TySZ// rBoB17726MtN9/YhEdcLy7VJVoBEmskKKdgrNhW4tKPjOW21dARbsKheCJrgEIWReOktK1vZ 0QFJSWY+eQMbEVt6nHCXGDYrQd/OU= X-IronPort-AV: E=Sophos;i="5.87,278,1631592000"; d="scan'208";a="58996274" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Daniel De Graaf , Daniel Smith Subject: [PATCH 2/2] xsm: Drop extern of non-existent variable Date: Wed, 1 Dec 2021 11:15:55 +0000 Message-ID: <20211201111555.16408-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20211201111555.16408-1-andrew.cooper3@citrix.com> References: <20211201111555.16408-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 dummy_xsm_ops was dropped as part of organising XSM to be altcall compatible, but the extern was accidentally left around. A later change reintroduced dummy_ops which is logically the same thing, but is private to xsm/dummy.c Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling") Signed-off-by: Andrew Cooper --- CC: Daniel De Graaf CC: Daniel Smith --- xen/include/xsm/xsm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5aa4dd588d17..3e2b7fe3dbb3 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -789,8 +789,6 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); bool has_xsm_magic(paddr_t); #endif -extern struct xsm_ops dummy_xsm_ops; - void xsm_fixup_ops(struct xsm_ops *ops); #ifdef CONFIG_XSM_FLASK