Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2500024ybl; Sat, 14 Dec 2019 13:33:50 -0800 (PST) X-Google-Smtp-Source: APXvYqzJ5K7/5LI+y96WTTa+HXM4+HVIQP6f7F9DKl5OE6IfHlG3g3LL9wgxOZ4mOcVyj6+pwQnA X-Received: by 2002:aca:c08b:: with SMTP id q133mr8203814oif.46.1576359230355; Sat, 14 Dec 2019 13:33:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576359230; cv=none; d=google.com; s=arc-20160816; b=ZQavKOUxYsUaR1B1WMAGJeg8Zn+Bd1LCiI+LCP4JyFtbILFcsZ8zisClrkCLPQL9T0 xiPgjs9G2pYFOsuq8ZSXckZQL7H+h/bbkQg/gM4b84UIG6HeYl2rW5CBWqttWmbjEBCJ Ulhg2ounvO5J+mfd+VXRnrCEifTONI/lhDXMG+gEH46ZHFSTSrEgdYLf9sP5D5IsZ9UF UJTq+X9wzsMRTMJe3ganOaYD3cMqtw7NRNDhAKEGKtZvyXOK6MKiwh8yYdKgbDzuysWi vRZNOJH0QhHhUzq534LXHanbZHTi3ac6gz+HyvPx/CvhB6YPCEEd42c04ip3W35L2aBN /Zyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=ZE43dsMkpbOowbdThDfr++A+vm8RAdpXC2KmBWEMOmk=; b=xrLhzbdPCTDSlrlB3QX9/GYgPL1KKHSTtC09wfMENKZJvF9rdyt8LLo142eOYpn2q4 hA71yEgNOdce5DYxynAMTdVb2/mxKj+wGDx/9p6OPSEAtYAgHnpfGt7g5r4wNKuPaIGn QF06VgOV72XTv1ToZV9c5b7r01q5gYbRzfbXg4YkTyaPkGY1EinN6SNdGnocsU1zuYVn q4hr+IQf9yhNJfk/d8Soym2uOl0Udc2m8UjmKlPXRcOnKhFmFRQnRDmlYeUmbj6f0Apd NU9FoCsWzGrxsa7fBEYfXj6tddcI2wFIrLA3z+hB01yI1cCAdm+EWm1MQbJ3iKMv/D7i OkCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GdWGTxKQ; 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 s128si7937832oig.204.2019.12.14.13.33.27; Sat, 14 Dec 2019 13:33:50 -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=GdWGTxKQ; 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 S1726865AbfLNVaM (ORCPT + 99 others); Sat, 14 Dec 2019 16:30:12 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40865 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726783AbfLNVaL (ORCPT ); Sat, 14 Dec 2019 16:30:11 -0500 Received: by mail-wr1-f67.google.com with SMTP id c14so2650357wrn.7 for ; Sat, 14 Dec 2019 13:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZE43dsMkpbOowbdThDfr++A+vm8RAdpXC2KmBWEMOmk=; b=GdWGTxKQxlxuSKElGDnFU8WiA2IFAvEmSQg2vzKcxkinj4Cb1yT1SuQeKu9UWcc23N miPgUxYb/GSsPl+TCdFF4/NMU0YuJd5dm1s4J0eGr9462tl7XCHZMoIBQzvalBRJ644e j4xPQ3AkKsP/TDNRDElTi+TPbnvcg+KV72f+oP/JDbooHbU4BBbdsYNcIVNNnufLBqwy gRCvC35HXk+r/F2be2MqMH1JDVHchBQR5E7qnpLElczt63rdbm3bstOvcGpwXIqBKUEt lw4EiYo3sRSetaVnzLFOviAHUB4+/6mQjcMBL7UQBYsdJioCvVUiPFhZQZnLga+6h8sa 8h6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZE43dsMkpbOowbdThDfr++A+vm8RAdpXC2KmBWEMOmk=; b=jsT5jIBGsAeHNQ9WK879rGpdGFj2bgvl7Y8I+DKW+J5TWXudXRxpIwYjRoisrgIX1Z 7sSgQkskU96n4DMDsgMw0PMtzsEWa88fYeObsxPGQ8ndY1OlJDuOePmgzhhq01DreOiB 3YQQ2z0/+AeB7uz57TuyEQKBGfkxbj8Nql6+7XFwsMiBjwRJsgrjOKZQXy+DOgRWHRcA DgTGFcmOvpanCNiaL8q0DxCVfQcpR37Tvri59yT53z8QdjaE1cULwsIzgWlLeswzf9Wc 56fSQRudZrcEiEsAVtNMhDgXkRCvA1OTMaBLL/MonZn65JfKbJDAkMjPOGHCtgrKxQli m+vQ== X-Gm-Message-State: APjAAAXHnlF1iYvaj0ssE+L20WYtalL6+jk3nXgstYggwYMpdgN7HAC3 iUVX+vRArz9JE5RctaQvVwmPYmlKW1/O9AejKdz1wQ== X-Received: by 2002:adf:cf0a:: with SMTP id o10mr19877635wrj.325.1576359009672; Sat, 14 Dec 2019 13:30:09 -0800 (PST) MIME-Version: 1.0 References: <20191214175735.22518-1-ardb@kernel.org> <20191214175735.22518-6-ardb@kernel.org> <20191214194626.GA140998@rani.riverdale.lan> <20191214194936.GB140998@rani.riverdale.lan> <20191214201334.GC140998@rani.riverdale.lan> <20191214211725.GG140998@rani.riverdale.lan> In-Reply-To: <20191214211725.GG140998@rani.riverdale.lan> From: Ard Biesheuvel Date: Sat, 14 Dec 2019 21:30:08 +0000 Message-ID: Subject: Re: [PATCH 05/10] efi/libstub: distinguish between native/mixed not 32/64 bit To: Arvind Sankar Cc: Ard Biesheuvel , Linux Kernel Mailing List , linux-efi , Hans de Goede , Matthew Garrett , Ingo Molnar , Andy Lutomirski , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 14 Dec 2019 at 22:17, Arvind Sankar wrote: > > On Sat, Dec 14, 2019 at 08:27:50PM +0000, Ard Biesheuvel wrote: > > On Sat, 14 Dec 2019 at 21:13, Arvind Sankar wrote: > > > > > > On Sat, Dec 14, 2019 at 07:54:25PM +0000, Ard Biesheuvel wrote: > > > > On Sat, 14 Dec 2019 at 20:49, Arvind Sankar wrote: > > > > > > > > > > On Sat, Dec 14, 2019 at 02:46:27PM -0500, Arvind Sankar wrote: > > > > > > On Sat, Dec 14, 2019 at 06:57:30PM +0100, Ard Biesheuvel wrote: > > > > > > > + > > > > > > > +#define efi_table_attr(table, attr, instance) ({ \ > > > > > > > + __typeof__(((table##_t *)0)->attr) __ret; \ > > > > > > > + if (efi_is_native()) { \ > > > > > > > + __ret = ((table##_t *)instance)->attr; \ > > > > > > > + } else { \ > > > > > > > + __typeof__(((table##_32_t *)0)->attr) at; \ > > > > > > > + at = (((table##_32_t *)(unsigned long)instance)->attr); \ > > > > > > > + __ret = (__typeof__(__ret))(unsigned long)at; \ > > > > > > > + } \ > > > > > > > + __ret; \ > > > > > > > +}) > > > > > > > > Yes. I'm open to suggestions on how to improve this, but mixed mode is > > somewhat of a maintenance burden, so if new future functionality needs > > to leave mixed mode behind, I'm not too bothered. > > > > Maybe just do > if (sizeof(at) < sizeof(__ret)) > __ret = (__typeof__(__ret))(uintptr_t)at; > else > __ret = (__typeof__(__ret))at; > That should cover most of the cases. But the compiler will still be unhappy about the else clause if __ret is a pointer type, since we'll be casting an u32 to a pointer,