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;
Subject: [PATCH v2 3/9] xen/x86: make "earlyprintk=xen" work better for PVH
 Dom0
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <roger.pau@citrix.com>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
References: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Message-ID: <4fd89dcb-cfc5-c740-2e94-bb271e432d3e@suse.com>
Date:   Thu, 30 Sep 2021 14:17:41 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z2l5Ui9veDJHZjJsaU1YcXNKQ1NCUWl1b1hjRXFUUTU3SmxzWTZjZCtLTW85?=
 =?utf-8?B?bkhWMnB0MkdVUkIvNmN6QkVISmRqU2FES3VNWm1VaTcvd1JMVGpxRmtDb0tL?=
 =?utf-8?B?T09kNmgrYzJLaGlJNS9GMEFESVVqYmFrVFpucE1aTk9RRjlvOG5ra0xVeHQw?=
 =?utf-8?B?THp0V2lGZG1uTVo4UGNZYW1QMnBYN1BBWnl2KytEczVFbzErNTZiVUJzUVdY?=
 =?utf-8?B?d3FBMi9Rc0Zaa0JEN2l3ZUhuTVk4ZEl3WHR0b2xhalVHZXhXUFVWMUZVYWEx?=
 =?utf-8?B?M2NVcU9MRUZ2ZFo1MW5CcE1aRnNCSGFEaU5VbnhjeW1KNmY0emdZZWY0Q2xi?=
 =?utf-8?B?dUtRd2krL0dSUVUyV3NkNHBUU3pMMXNRNUtNbnM0ajM5TzkyekRBNDk3TDF5?=
 =?utf-8?B?VmdKVWMzWDNYdzhvcE8vdFVpQ2lHU1M1Rldsc2RrY21UT1lOb2xSdzNiZU8y?=
 =?utf-8?B?YWhlbzBjNFdDVTRJaHhqellIUDlOT3REeTBDMFlOWjZIOU0ra0RXVDhiN0RC?=
 =?utf-8?B?TCtDcHRIdFNMMkdjWG8vMG1XeEt2Z0FUQmtCb2daY3hxbG5BT1BiS1VXK2lm?=
 =?utf-8?B?ejJacTMxS2EzUTgvNUdYVXhUNHZaWXBpNVRBeFBxVHdsdGU4RjVhRm9KK0Ex?=
 =?utf-8?B?SkFzWlUrRERDOEoxSTZWdjdNNUdpYzlneTNLdlZyN0Y1MHF4N2h3VEZkMG5w?=
 =?utf-8?B?eEYzVXRvQ2ZqeEE2MGVKdzNvL1p6R1VwNldPbVdhTnVSTG5ydFNLNExIVGJN?=
 =?utf-8?B?ZGI4MWg5aG5tcWh6NXBEYjBMWDdtU0pFNmdjSkdlazlGdTlIVVBaSTNTcGJu?=
 =?utf-8?B?aGdnNGlXMVJ3UFlEd2tTVndTeTd5R2ZxcjlsaHNScHBjSkJoMzYreXNZZmxV?=
 =?utf-8?B?VW5lM0oxSUoxeGpoR010OFpEaVU5blhGQUxWYWErNHRtYnNWYjFXeFdhQXlI?=
 =?utf-8?B?aE1yVTE4Kyt6RTF4Mmd3cng5cDl5T3NVRVFCOE9vNEpzbk85RzFRdFlpK1BW?=
 =?utf-8?B?R29SN1BIZTYxcnE5a1dHR0xmZThIdFJXcjFsaS9hLzhyczd4aXZEVmduNmlz?=
 =?utf-8?B?Z2Uvcm5hdjJIQWwrZU1GTk0yVWN2VDl4YzVvOGxZRjVOaXpxQ0Y3QkVHeWMv?=
 =?utf-8?B?clhZd3VFRENWQlN2dk1qNU1NVTVDUllXV3JmTjVDbXlLZW9JOWNLL2hCbGlC?=
 =?utf-8?B?WHBoSVBiamdUVWhEZ0ZPYTcrZFFBcEJlODQ3NzRwUW51eGxyMU15cVFJR3dm?=
 =?utf-8?B?TkpVbm92NlFsTEJ1ckhvdi8zUGx0V25QK1RwSy9OT3pEa2tOZmJmblZLaEZD?=
 =?utf-8?B?ZnpvT2tORVNPRzF5bGk0L21tOFd5enpzOXc1REl2RmdUNVZPdmFYckVIQnBk?=
 =?utf-8?B?czNJTHJnUWRUSTNCaFlPeUxtd3ljQzZHVWRPWjZQZi81ZTZjdlNCb2JvWDEz?=
 =?utf-8?B?a0NXSE12WDhrSm9iOW9wendIZlRvV2ZWME8wMzVYZ3VSSlMxaVc3T0JPZEJ1?=
 =?utf-8?B?Q2Z0MWJ0K0tCTGlSSDBUZGpodWtZZGFUTVI4VVR3Y1kwbk52bE1MeWNWVTRq?=
 =?utf-8?B?OXhGKzNTaUhGT0gyWXVsRXl4cEIweDE3WnJRcmJJT1llVVVSNENvWmJpQVdZ?=
 =?utf-8?B?WFpaVVJtSXRtU3VrL0ZxdThEZTRGQ2FicFZmOWozMzVoVmlDeVFxcUUySTZZ?=
 =?utf-8?B?aktuVnBoK1VWRTJ5UWNiZ21zbjdTS3RhaEhPQ2oyNCs5bnRXZUF0bGE2b0pR?=
 =?utf-8?Q?oxCC5HmGvDaL6Bxq2SsRm47MlhXV05bdknJeo/5?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 470e41f3-34f5-4da3-c49f-08d9840c4df2
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 12:17:43.2894
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lFadeeFoNL/7Rb1Q+XP2lyTmtWaR1GHLFxRSjCxuQFlbBOBsfkCJp2t/4s7/Uv9e4J6Rb5RdE/atFnGkhO0OFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7038
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The xen_hvm_early_write() path better wouldn't be taken in this case;
while port 0xE9 can be used, the hypercall path is quite a bit more
efficient. Put that first, as it may also work for DomU-s (see also
xen_raw_console_write()).

While there also bail from the function when the first
domU_write_console() failed - later ones aren't going to succeed.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>

--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -632,17 +632,16 @@ static void xenboot_write_console(struct
 	unsigned int linelen, off = 0;
 	const char *pos;
 
+	if (dom0_write_console(0, string, len) >= 0)
+		return;
+
 	if (!xen_pv_domain()) {
 		xen_hvm_early_write(0, string, len);
 		return;
 	}
 
-	dom0_write_console(0, string, len);
-
-	if (xen_initial_domain())
+	if (domU_write_console(0, "(early) ", 8) < 0)
 		return;
-
-	domU_write_console(0, "(early) ", 8);
 	while (off < len && NULL != (pos = strchr(string+off, '\n'))) {
 		linelen = pos-string+off;
 		if (off + linelen > len)