From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1835114A0B3 for ; Sun, 12 Jan 2025 19:20:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736709656; cv=none; b=keGq7ED1Gdfx8AdWEmRZtd9Jx0CmRxAvAZfQqk9yNRTPN9XXKwRpzBaCDZP2OUpHI1cMs5aAgk8qwbfbjVI9MB/gZ7HhXN8dKraM6hLwSpDKgZlhLQnr3mITYOZgjtTDTKcM/ZMREYUC1bKo+DCwTgbnebP7FcCfp9sccRS4Q5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736709656; c=relaxed/simple; bh=4ZUtUE2EXSE+Rged+y3a94MD+9/6skm1ypalmeB85fw=; h=From:To:Cc:Subject:In-Reply-To:Date:Message-ID:References; b=bWJq3aSwroEVrU4/j2P+7PAKzmFF2Eg7bTjJrMhz296m5iA3nHb9dKBjIuhdD+T8lGhtn/9u4q5eKbEwz/BAHFU4e95uStRQSuwcKgB0TQh9+4KmSI4DpSAE8iTERw7yn4B55HLXkt9slAtk+FscNpUYCHLNCd6H9eNcpq5OPX4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q8WBXbAP; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q8WBXbAP" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2164b662090so56971215ad.1 for ; Sun, 12 Jan 2025 11:20:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736709654; x=1737314454; darn=vger.kernel.org; h=references:message-id:date:in-reply-to:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=wsAmiSSbEEfyIjEs4CBNhqUDStWdLlryb3CPRW9ZMYo=; b=Q8WBXbAPt2Gf2bkHvhjj6R3zG/glv1XBpTSo6k1TukUv6X3E6EFA98hxMd7kTIw3r7 M6CjD79bqFrKIFn8oiyXZVlypaDhTW7BPmuuxUknScNK055SvifG6ixBJje0sK1hNqEr QOU63e03E/9UfDORIAI4KdwVCPbtv+pbMwii3KwoowgiUUnqivDU1/XKk9fzOZn0j4GG 7U8PZnrxeMm2Icb9DPOIHvWA59pXu9NUI1WXUd9k8qbMneAy8+FO7X+6yyyO7fbx/eXM Gkv08CFIsKTSE0pei2aEfrL/Zqgz9M+w9sqEaHdnfSfsdKrosYVxBRKoHOJxRZYTmVSd TMPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736709654; x=1737314454; h=references:message-id:date:in-reply-to:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wsAmiSSbEEfyIjEs4CBNhqUDStWdLlryb3CPRW9ZMYo=; b=qlRyEeJvoG/1XtXd2/zngN+pojaiecDNjHsBQTu1sjgidewTXMNOeNbT+67cX4Y6T5 ktqyQLwRJekyd1mOucGgIxa5vQ9WxRqSX9Mmxsal2XvzqN81Yz2ZB+yfFsB2RzR5I4W6 T2Vbrlez1ebDose1eTPR6J+4k9r0y/PUkx7c76fDTJJTqsrpgXyYMoHeDiLKt1XloxZW rTo6jMawKnr3z09zp2AP0aMLMASPG0bbwu70yhdCwQVhQEa1ZhEOsfNyU9leepEE/B8x 4i5Yzs9IjTub2FD3vV2gBW4QWZ7TF5twwZPe3eNbcHCISOuoWYYSI561Gb34wnClbhoo 2Y3Q== X-Forwarded-Encrypted: i=1; AJvYcCW8f47ibA6l556s7XSvs7u9MFF13sSRDvHjuXx3gXerjFz0tJlKyDWYgxZjdw2LNtru98mAQynvhLbHNe0=@vger.kernel.org X-Gm-Message-State: AOJu0YyT/hPyhxbsiG7IJNaMRXqtx6GOsgKwEKwQaf4JFdX3Bv2BeXAF DP3cxzyh5GU+LqOnkueuf69k9AGM/g82wlGHYOmg/l24ZMnoIZtT X-Gm-Gg: ASbGncuKbWPYS3az32XSd8YwbuZDKRl8x15QAy5gjqKNqO7KoP8J0+y7iAFT1rAC3S1 269hs3OQOnaE3WwdwiU2w+Gzx18BxtplMrqHEnbwO8RvJkjjjOUCEl6sXmDiaIhTzPneCSf7fB8 sNUe85Ir61s6g0fQ/iDSpVEu3ES4x6C0sSnO//wzH6e9+N3N3XZ4SbdggTVeOgJ7Bdm3rvnnP+i C1OF4oLnUgAVbltyhPBgN4qCkYiRzOzVVyfl2apS9Br+j4b X-Google-Smtp-Source: AGHT+IFlTFXztgnfomDANQsLXoOOUGzpWHCKbCDM7RLfo+Gb7ONbz/UOs4zB+DaT8wStm0uuC5eViQ== X-Received: by 2002:a17:902:ccc8:b0:215:a05d:fb05 with SMTP id d9443c01a7336-21a83f72d92mr293549275ad.32.1736709654304; Sun, 12 Jan 2025 11:20:54 -0800 (PST) Received: from dw-tp ([171.76.81.42]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-a31d5047ce4sm5728247a12.52.2025.01.12.11.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 11:20:53 -0800 (PST) From: Ritesh Harjani (IBM) To: Christophe Leroy , Michael Ellerman , Nicholas Piggin , Naveen N Rao , Madhavan Srinivasan Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kernel test robot Subject: Re: [PATCH v2] powerpc/64s: Rewrite __real_pte() and __rpte_to_hidx() as static inline In-Reply-To: Date: Mon, 13 Jan 2025 00:43:19 +0530 Message-ID: <87ldvfvoa8.fsf@gmail.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Christophe Leroy writes: > Rewrite __real_pte() and __rpte_to_hidx() as static inline in order to > avoid following warnings/errors when building with 4k page size: > > CC arch/powerpc/mm/book3s64/hash_tlb.o > arch/powerpc/mm/book3s64/hash_tlb.c: In function 'hpte_need_flush': > arch/powerpc/mm/book3s64/hash_tlb.c:49:16: error: variable 'offset' set but not used [-Werror=unused-but-set-variable] > 49 | int i, offset; > | ^~~~~~ > > CC arch/powerpc/mm/book3s64/hash_native.o > arch/powerpc/mm/book3s64/hash_native.c: In function 'native_flush_hash_range': > arch/powerpc/mm/book3s64/hash_native.c:782:29: error: variable 'index' set but not used [-Werror=unused-but-set-variable] > 782 | unsigned long hash, index, hidx, shift, slot; > | ^~~~~ > > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202501081741.AYFwybsq-lkp@intel.com/ > Fixes: ff31e105464d ("powerpc/mm/hash64: Store the slot information at the right offset for hugetlb") > Signed-off-by: Christophe Leroy > --- > v2: Also inline __rpte_to_hidx() for the same reason Thanks for addressing the other warning too in v2. I also tested the changes on my system and this fixes both the reported warnings. The changes looks good to me. Please feel free to add - Reviewed-by: Ritesh Harjani (IBM) > --- > arch/powerpc/include/asm/book3s/64/hash-4k.h | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h > index c3efacab4b94..aa90a048f319 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash-4k.h > +++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h > @@ -77,9 +77,17 @@ > /* > * With 4K page size the real_pte machinery is all nops. > */ > -#define __real_pte(e, p, o) ((real_pte_t){(e)}) > +static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep, int offset) > +{ > + return (real_pte_t){pte}; > +} > + > #define __rpte_to_pte(r) ((r).pte) > -#define __rpte_to_hidx(r,index) (pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT) > + > +static inline unsigned long __rpte_to_hidx(real_pte_t rpte, unsigned long index) > +{ > + return pte_val(__rpte_to_pte(rpte)) >> H_PAGE_F_GIX_SHIFT; > +} > > #define pte_iterate_hashed_subpages(rpte, psize, va, index, shift) \ > do { \ > -- > 2.47.0