From patchwork Thu Jun 13 11:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 13696649 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 A576769959 for ; Thu, 13 Jun 2024 11:25:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718277942; cv=none; b=qikWTX2isKX/R6EXGisLQH2azT9CMSATcLEYMwBRCcsrE0UpRNwTLZT07ayI3b7Li0m1mfR8X6ljaw1R7QbjGPZyJo17f5lPxc+ldl9uBV5W1Bw7Kpz1rSEPbS60L28wnQSbe0tC1/hHMaqGLeJqTQ28fJdps+vBFl9Mci69E1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718277942; c=relaxed/simple; bh=dIEuACjsltwpJD0V+bskvqcb6UYaTtASIQDE9vOPI5Q=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=mxPhDCsZXeleMagden/YygCXgmXpM+Zkr9NiZSJQFbypP/DPv8mLjZfoGTVj3bIvS8HVys0B/i36wGp7oppQJE92P16+VcZokkmCm/j4+0frX+WFSn+pDyf0mB6OCaPwFzHg9ON+oujtWfNLak0GzUDsRrY34yQgKhaMgHBtEs4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--maze.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=oJooeywx; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--maze.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oJooeywx" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfef7896c01so1567102276.2 for ; Thu, 13 Jun 2024 04:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718277939; x=1718882739; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:from:to:cc:subject:date:message-id:reply-to; bh=lYU5Qi8biKRQ+V307T1KahsI7+1YeIx8/OH0uEw2Xw0=; b=oJooeywxkO0d4Pj61kKsLrSQs1B3a1Tss9sQOUwYGjbxN7OGgVbqr5mA1/xQIyCyz5 S51ISzftTY8juze5o5YpEJSHgRGyfoPFhLM5EXukrM8F/8LsTGYHuebR32fIIuROY8BU Kbe/oH7otdcUh8PxEgBL3mEcZV/xO9qk+dd2/xLXUw5humWzrs5A0T2GFAZrcN5LxgV4 KIOYZpDUl2d5QqCJ3YzmpzrTtm+1o20q9dMQaUeXFibm57f28s5Eu5o9sWkwlV2/tSMb uxaGeU+M2MXdXEVKNXS8EI9SDNDEApRGHG5QluX6j/qYAmadGKs7lqDuWBTDxWpn/1OP ANJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718277939; x=1718882739; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lYU5Qi8biKRQ+V307T1KahsI7+1YeIx8/OH0uEw2Xw0=; b=T5spvaEXm12qFHSRTW9Wws5KHYlF5/7Cs0JZAo1mURuO74DwRWAxXsLGHJAiRHHMpI IkqpIbwrgoxgz0AYduKzSUr1X3O9Cd1FsY8MdjQ1mLxDkFZ0SPsxosGlol12uRv/PdfC CnGwiEL73Yli4F1fAnE7+otqxaufgSXLQ/s3FVOHgBfOCkhSeCC6zdeiQuJADdCjy7SS mQY37UOKIGQcc+WCwov/7FT3JQa1IMA6t/Nlo3Kjep8cjMTa58+lmkdiQdzGd50bg+A3 y8Ex8QtfttvR60i6S5JkVKgz2mkM6umfs0rDBhKD4Rxso5e8MXLqOY8KHFEAxARMnOOr X83A== X-Forwarded-Encrypted: i=1; AJvYcCWMZoXuj1cRJwOWbFBvfoCIhYpEZvaMtDj5ysaz7W2Uf/vJ4e1wWrf9EkYMsTFvB9+0HbzmnTsVDqSVEiFadG5zoTS0 X-Gm-Message-State: AOJu0YwbZWsoBBI0mCtRWc4JnBPlITisAk98J88HjPVWD9NOkyVhWOrT 4E3sf2rD05qHDFeBmY39ZJYDysRkbl9ZJTu2cAzt3NiWMI4AUsYOsZ2Jy9ZTkDYv1EJm9A== X-Google-Smtp-Source: AGHT+IE5cYOWPRlw6S39TBxcIhI0UJc6usmRvvQ+LAF777UZDs8ja6+2n0iUZpH3/qgQ4I32o2LJxR91 X-Received: from varda.mtv.corp.google.com ([2620:15c:211:200:39d0:ab84:9864:b0c6]) (user=maze job=sendgmr) by 2002:a05:6902:706:b0:dff:4a3:2def with SMTP id 3f1490d57ef6-dff04a333edmr496451276.10.1718277939510; Thu, 13 Jun 2024 04:25:39 -0700 (PDT) Date: Thu, 13 Jun 2024 04:25:20 -0700 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Message-ID: <20240613112520.1526350-1-maze@google.com> Subject: [PATCH bpf] bpf: fix UML x86_64 compile failure From: " =?utf-8?q?Maciej_=C5=BBenczykowski?= " To: " =?utf-8?q?Maciej_=C5=BBenczykowski?= " Cc: Linux Network Development Mailing List , Linux Kernel Mailing List , BPF Mailing List , " =?utf-8?q?Maciej_=C5=BBenczykows?= =?utf-8?q?ki?= " , Andrii Nakryiko , John Fastabend , Alexei Starovoitov X-Patchwork-Delegate: bpf@iogearbox.net Cc: Andrii Nakryiko Cc: John Fastabend Cc: Alexei Starovoitov Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper") Signed-off-by: Maciej Żenczykowski --- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 36ef8e96787e..7a354b1e6197 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -20313,7 +20313,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env) goto next_insn; } -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) /* Implement bpf_get_smp_processor_id() inline. */ if (insn->imm == BPF_FUNC_get_smp_processor_id && prog->jit_requested && bpf_jit_supports_percpu_insn()) {